Skip to content

O
order-group
Commit 5d9a54e0 by 徐康
Options

修改文件位置

parent 79b5413c
Showing with 89 additions and 98 deletions
order-application-service/src/main/java/cn/freemud/OrderApplication.java
......@@ -42,7 +42,7 @@ import tk.mybatis.spring.annotation.MapperScan;
@ComponentScan({"cn.freemud", "com.freemud"})
@MapperScan({"cn.freemud.*.dao","com.freemud.sdk.api.assortment.orderdistributor.mapper","com.freemud.api.assortment.datamanager.manager",
"com.freemud.api.assortment.datamanager.queue.dao","com.freemud.api.assortment.datamanager.rbac.dao","com.freemud.api.assortment.datamanager.queue.entity"})
@EnableFeignClients({"cn.freemud.service.thirdparty","com.freemud.sdk.api.assortment.message","com.freemud.sdk.api.assortment.order.service.thirdparty"})
@EnableFeignClients({"cn.freemud.service.thirdparty","com.freemud.sdk.api.assortment.message","cn.freemud.service.mccafe.thirdparty"})
@EnableAutoConfiguration
public class OrderApplication {
public static void main(String[] args) {
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/GetAppKeyRequestDto.java → order-application-service/src/main/java/cn/freemud/entities/dto/coupon/GetAppKeyRequestDto.java
package com.freemud.sdk.api.assortment.order.entities;
package cn.freemud.entities.dto.coupon;
import lombok.AllArgsConstructor;
import lombok.Builder;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/coupon/MCCafeConponRequest.java → order-application-service/src/main/java/cn/freemud/entities/dto/coupon/MCCafeConponRequest.java
package com.freemud.sdk.api.assortment.order.request.coupon;
package cn.freemud.entities.dto.coupon;
import com.freemud.application.sdk.api.couponcenter.offline.domain.TransactionVO;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/MCCafeChannelEnum.java → order-application-service/src/main/java/cn/freemud/enums/MCCafeChannelEnum.java
......@@ -10,7 +10,7 @@
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package com.freemud.sdk.api.assortment.order.enums;
package cn.freemud.enums;
public enum MCCafeChannelEnum {
......
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
......@@ -16,9 +16,6 @@ import cn.freemud.base.constant.Version;
import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.StoreConstant;
import cn.freemud.entities.db.OpenPlatformIappWxappConfig;
import cn.freemud.entities.db.OpenPlatformPartnerStoreDeliveryConfig;
import cn.freemud.entities.db.StoreTableNumber;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.order.BusinessDate;
import cn.freemud.entities.dto.shoppingCart.GetShoppingCartGoodsApportionDto;
......@@ -28,8 +25,6 @@ import cn.freemud.enums.CouponFlag;
import cn.freemud.enums.CreateOrderType;
import cn.freemud.enums.ResponseResult;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.manager.OpenPlatformIappWxappConfigManager;
import cn.freemud.manager.OpenPlatformPartnerStoreDeliveryConfigManager;
import cn.freemud.manager.StoreTableNumberManager;
import cn.freemud.service.CouponService;
import cn.freemud.service.thirdparty.ShoppingCartClient;
......@@ -58,9 +53,9 @@ import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import com.freemud.sdk.api.assortment.order.enums.CouponReqTypeEnum;
import com.freemud.sdk.api.assortment.order.request.coupon.MCCafeConponRequest;
import com.freemud.sdk.api.assortment.order.service.CouponClientService;
import cn.freemud.enums.CouponReqTypeEnum;
import cn.freemud.entities.dto.coupon.MCCafeConponRequest;
import cn.freemud.service.mccafe.CouponClientService;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import org.apache.commons.collections4.CollectionUtils;
......@@ -580,10 +575,46 @@ public class CheckOrder {
requestDto.setShoppingCartInfoRequestVo(shoppingCartInfoRequestVo);
//加价购商品 校验放购物车校验
requestDto.setPremiumExchangeActivity(createOrderVo.getPremiumExchangeActivity());
// cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse = shoppingCartClient.getShoppingCartGoodsApportionNew(requestDto);
//cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse = shoppingCartClient.getShoppingCartGoodsApportionNew(requestDto);
//暂时写死测试数据
cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse = JSON.parseObject(
"{\"code\":\"100\",\"message\":\"success\",\"result\":{\"activityDiscountsDtos\":[{\"activityCode\":\"MMJ2020080414450543441\",\"activityName\":\"231321313\",\"activityType\":11,\"discountAmount\":-200}],\"isDiscountDelivery\":false,\"originalTotalAmount\":1600,\"packageAmount\":2,\"products\":[{\"activityDiscountsDtos\":[{\"activityCode\":\"MMJ2020080414450543441\",\"activityName\":\"231321313\",\"activityType\":11,\"discountAmount\":124}],\"attributeNames\":\"{\\\"attributeNames\\\":\\\"微辣\\\"}\",\"classificationId\":\"\",\"customerCode\":\"144101061128506371\",\"extraList\":[{\"attributeId\":\"141178803539043623\",\"attributeName\":\"微辣\"}],\"hasProductCoupon\":false,\"materialList\":[{\"activityDiscountsDtos\":[{\"activityCode\":\"MMJ2020080414450543441\",\"activityName\":\"231321313\",\"activityType\":11,\"discountAmount\":13}],\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"extraList\":[],\"hasProductCoupon\":false,\"originalPrice\":100,\"spuId\":\"180924094892495124\",\"spuName\":\"红豆\",\"stockLimit\":false,\"totalDiscountAmount\":26},{\"activityDiscountsDtos\":[{\"activityCode\":\"MMJ2020080414450543441\",\"activityName\":\"231321313\",\"activityType\":11,\"discountAmount\":26}],\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"extraList\":[],\"hasProductCoupon\":false,\"originalPrice\":200,\"spuId\":\"180924005379756305\",\"spuName\":\"奶盖\",\"stockLimit\":false,\"totalDiscountAmount\":52}],\"originalPrice\":800,\"picture\":\"https://img10.sandload.cn/zfd0x0.jpg?timestamp=1593831027040\",\"productType\":88,\"qty\":2,\"skuId\":\"144101061128506371\",\"skuName\":\"红烧鱼块\",\"spuId\":\"144101061128506371\",\"spuName\":\"红烧鱼块\",\"stockLimit\":false,\"totalDiscountAmount\":202,\"unit\":\"\",\"weight\":0.0}],\"reduceScore\":140,\"scoreReduceAmount\":1400,\"stocks\":[{\"activityCode\":\"MMJ2020080414450543441\",\"activityStock\":1,\"activityType\":11,\"goodsStock\":[]}],\"totalAmount\":1400,\"totalDiscountAmount\":200},\"ver\":\"1\"}"
, new TypeReference<cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto>>(){}
"{\n" +
" \"code\": \"100\",\n" +
" \"message\": \"success\",\n" +
" \"result\": {\n" +
" \"activityDiscountsDtos\": [],\n" +
" \"isDiscountDelivery\": false,\n" +
" \"originalTotalAmount\": 1,\n" +
" \"products\": [\n" +
" {\n" +
" \"activityDiscountsDtos\": [],\n" +
" \"attributeNames\": \"{\\\"attributeNames\\\":\\\"\\\"}\",\n" +
" \"categoryName\": \"鞍山市\",\n" +
" \"classificationId\": \"\",\n" +
" \"customerCode\": \"4095\",\n" +
" \"extraList\": [],\n" +
" \"hasProductCoupon\": false,\n" +
" \"materialList\": [],\n" +
" \"originalPrice\": 1,\n" +
" \"picture\": \"https://img10.sandload.cn/zfd0x0.jpg?timestamp=1593831027040\",\n" +
" \"qty\": 1,\n" +
" \"skuId\": \"162535232231270663\",\n" +
" \"skuName\": \"鱿鱼须把把串\",\n" +
" \"spuId\": \"162535232231270663\",\n" +
" \"spuName\": \"鱿鱼须把把串\",\n" +
" \"stockLimit\": false,\n" +
" \"totalDiscountAmount\": 0,\n" +
" \"unit\": \"g\",\n" +
" \"weight\": 0\n" +
" }\n" +
" ],\n" +
" \"reduceScore\": 0,\n" +
" \"scoreReduceAmount\": 0,\n" +
" \"totalAmount\": 1,\n" +
" \"totalDiscountAmount\": 0\n" +
" },\n" +
" \"ver\": \"1\"\n" +
"}", new TypeReference<cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto>>(){}
);
if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, apportionResponse.getCode())) {
ResponseResult responseResult = ResponseResult.getResponseResult(apportionResponse.getCode());
......
order-application-service/src/main/java/cn/freemud/service/impl/EvaluationServiceImpl.java
......@@ -6,7 +6,6 @@ import cn.freemud.base.util.DateUtil;
import cn.freemud.entities.dto.AddProductEvaluationReqDto;
import cn.freemud.entities.dto.Evaluation.OrderEvaluationStatus;
import cn.freemud.entities.vo.AddUserOrderEvaluationNewRequestVo;
import cn.freemud.entities.vo.AddUserOrderEvaluationRequestVo;
import cn.freemud.entities.vo.GetEvaluationDetailByOrderIdRequestVo;
import cn.freemud.entities.vo.GetEvaluationStatusNewRequestVo;
import cn.freemud.enums.EvaluationStatus;
......
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
......@@ -13,7 +13,6 @@
package cn.freemud.service.impl;
import cn.freemud.adapter.*;
import cn.freemud.amp.body.MessagePushNewMqBody;
import cn.freemud.amqp.Header;
import cn.freemud.amqp.MQAction;
import cn.freemud.amqp.MQMessage;
......@@ -22,18 +21,13 @@ import cn.freemud.base.constant.Version;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.base.log.LogTreadLocal;
import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.OrderRefundConstant;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.dto.PayAccessResponse;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
import cn.freemud.entities.dto.order.CreateOrderOperateDto;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.order.FacePayRequestDto;
import cn.freemud.entities.dto.order.FacePayResponseDto;
import cn.freemud.entities.dto.product.AttributeValue;
import cn.freemud.entities.dto.product.GroupDetail;
import cn.freemud.entities.dto.product.ProductAttributeGroup;
......@@ -46,7 +40,6 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.*;
import cn.freemud.service.thirdparty.*;
import cn.freemud.utils.BeanUtil;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.ResponseUtil;
import cn.freemud.utils.ValidationCode;
......@@ -55,20 +48,14 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.db.*;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.enums.IappIdType;
import com.freemud.api.assortment.datamanager.manager.*;
import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPartnerWxappConfigManager;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
import com.freemud.application.sdk.api.constant.ResponseConstant;
import com.freemud.application.sdk.api.constant.ResponseResultEnum;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto;
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
......@@ -79,39 +66,30 @@ import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmoun
import com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResponse;
import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
import com.freemud.application.sdk.api.storecenter.request.GetListByCodesRequest;
import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.GetListByCodesResponse;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
import com.freemud.sdk.api.assortment.message.config.MessageOfficialRefundPushMqConfig;
import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsg;
import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsgDataValue;
import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService;
import com.freemud.sdk.api.assortment.order.enums.CouponReqTypeEnum;
import com.freemud.sdk.api.assortment.order.enums.MCCafeChannelEnum;
import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
import cn.freemud.enums.CouponReqTypeEnum;
import cn.freemud.enums.MCCafeChannelEnum;
import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
import com.freemud.sdk.api.assortment.order.request.coupon.MCCafeConponRequest;
import com.freemud.sdk.api.assortment.order.request.coupon.MCCafeCouponLockRequest;
import com.freemud.sdk.api.assortment.order.request.coupon.MCCafeProductRedeemVo;
import com.freemud.sdk.api.assortment.order.request.coupon.MCCafeTransactionVo;
import cn.freemud.entities.dto.coupon.MCCafeConponRequest;
import cn.freemud.entities.dto.coupon.MCCafeCouponLockRequest;
import cn.freemud.entities.dto.coupon.MCCafeProductRedeemVo;
import cn.freemud.entities.dto.coupon.MCCafeTransactionVo;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.CouponClientService;
import com.freemud.sdk.api.assortment.order.service.MCCafeOrderCenterSdkService;
import cn.freemud.service.mccafe.CouponClientService;
import cn.freemud.service.mccafe.MCCafeOrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.freemud.sdk.api.assortment.payment.service.StandardPaymentService;
import com.google.common.collect.Lists;
......@@ -121,7 +99,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
......@@ -129,12 +106,8 @@ import org.springframework.stereotype.Service;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR;
@Service
@Slf4j
public class MCCafeOrderServiceImpl implements MCCafeOrderService {
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -29,7 +29,6 @@ import cn.freemud.service.BuriedPointService;
import cn.freemud.service.MallOrderService;
import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
import cn.freemud.service.thirdparty.ShoppingCartClient;
import cn.freemud.service.thirdparty.WechatApplicationServiceClient;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.ResponseUtil;
import cn.freemud.utils.ValidationCode;
......@@ -46,7 +45,6 @@ import com.freemud.application.sdk.api.deliverycenter.response.CreateDeliveryOrd
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto;
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
......@@ -69,7 +67,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
......@@ -2,7 +2,6 @@ package cn.freemud.service.impl;
import cn.freemud.adapter.MessageNoticeAdapter;
import cn.freemud.adapter.OrderAdapter;
import cn.freemud.base.log.LogTreadLocal;
import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.constant.ResponseCodeConstant;
......@@ -42,7 +41,6 @@ import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.AssortmentAffirmGroupOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
......@@ -57,8 +55,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.sql.Time;
import java.text.MessageFormat;
import java.util.Date;
import java.util.Map;
import java.util.concurrent.TimeUnit;
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -55,7 +55,6 @@ import cn.freemud.utils.ValidationCode;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.freemud.api.assortment.datamanager.entity.db.*;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.*;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/CouponClientService.java → order-application-service/src/main/java/cn/freemud/service/mccafe/CouponClientService.java
package com.freemud.sdk.api.assortment.order.service;
package cn.freemud.service.mccafe;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponQueryResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
import com.freemud.sdk.api.assortment.order.request.coupon.MCCafeConponRequest;
import com.freemud.sdk.api.assortment.order.request.coupon.MCCafeCouponLockRequest;
import cn.freemud.entities.dto.coupon.MCCafeConponRequest;
import cn.freemud.entities.dto.coupon.MCCafeCouponLockRequest;
import com.freemud.sdk.api.assortment.order.request.order.CreateOrderAccountRequest;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/MCCafeOrderCenterSdkService.java → order-application-service/src/main/java/cn/freemud/service/mccafe/MCCafeOrderCenterSdkService.java
package com.freemud.sdk.api.assortment.order.service;
package cn.freemud.service.mccafe;
import com.freemud.application.sdk.api.ordercenter.request.QueryAfterSalesOrderConditionsReq;
import com.freemud.application.sdk.api.ordercenter.response.AfterSalesListResp;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/CouponClientServiceImpl.java → order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
package com.freemud.sdk.api.assortment.order.service.order;
package cn.freemud.service.mccafe.impl;
import cn.freemud.base.constant.Version;
import cn.freemud.entities.dto.coupon.MCCafeConponRequest;
import cn.freemud.entities.dto.coupon.MCCafeCouponLockRequest;
import cn.freemud.enums.CouponReqTypeEnum;
import cn.freemud.enums.MCCafeChannelEnum;
import cn.freemud.service.mccafe.CouponClientService;
import cn.freemud.service.mccafe.thirdparty.CouponOfflineMCCafeClient;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponQueryResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.sdk.api.assortment.order.enums.*;
import com.freemud.sdk.api.assortment.order.request.coupon.*;
import com.freemud.sdk.api.assortment.order.request.order.CreateOrderAccountRequest;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.service.CouponClientService;
import com.freemud.sdk.api.assortment.order.service.thirdparty.CouponOfflineMCCafeClient;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class CouponClientServiceImpl implements CouponClientService {
......@@ -134,7 +135,7 @@ public class CouponClientServiceImpl implements CouponClientService {
couponCodeVerificationDto.setOfferId(accountBean.getAccountId());
couponCodeVerificationDto.setNumber("1");
couponCodeVerificationDto.setChannel(OrderClientType.ALIPAY.getIndex().toString().equals(orderBean.getOrderClient())
?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName());
? MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName());
couponCodeVerificationDto.setOperatorId("-1");
couponCodeVerificationDto.setStationId("-1");
couponCodeVerificationDto.setSign("skip");
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/MCCafeOrderCenterSdkServiceImpl.java → order-application-service/src/main/java/cn/freemud/service/mccafe/impl/MCCafeOrderCenterSdkServiceImpl.java
package com.freemud.sdk.api.assortment.order.service.order;
package cn.freemud.service.mccafe.impl;
import cn.freemud.amqp.Header;
import cn.freemud.amqp.MQAction;
import cn.freemud.amqp.MQMessage;
import cn.freemud.amqp.MQService;
import cn.freemud.service.mccafe.CouponClientService;
import cn.freemud.service.mccafe.MCCafeOrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
import com.freemud.api.assortment.datamanager.order.config.ManagerOrderBeanConfig;
import com.freemud.api.assortment.datamanager.order.manager.AssortmentOrderManager;
import com.freemud.application.sdk.api.base.BaseResponse;
import com.freemud.application.sdk.api.couponcenter.offline.request.CouponRequest;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCouponSdkService;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
......@@ -36,7 +37,6 @@ import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
import com.freemud.sdk.api.assortment.order.adapter.ActivitySdkAdapter;
import com.freemud.sdk.api.assortment.order.adapter.MemberSdkAdapter;
import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
import com.freemud.sdk.api.assortment.order.enums.OldOrderType;
import com.freemud.sdk.api.assortment.order.enums.ResponseResult;
import com.freemud.sdk.api.assortment.order.enums.StockChangeType;
import com.freemud.sdk.api.assortment.order.request.order.*;
......@@ -44,9 +44,6 @@ import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.CreateFatherSonOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.service.CouponClientService;
import com.freemud.sdk.api.assortment.order.service.MCCafeOrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/thirdparty/CardBinMCCafeClient.java → order-application-service/src/main/java/cn/freemud/service/mccafe/thirdparty/CardBinMCCafeClient.java
package com.freemud.sdk.api.assortment.order.service.thirdparty;
package cn.freemud.service.mccafe.thirdparty;
import com.freemud.sdk.api.assortment.order.entities.BatchQueryActivityInfoRequestDto;
import com.freemud.sdk.api.assortment.order.entities.GetAppKeyRequestDto;
import cn.freemud.entities.dto.coupon.BatchQueryActivityInfoRequestDto;
import cn.freemud.entities.dto.coupon.GetAppKeyRequestDto;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/thirdparty/CouponOfflineMCCafeClient.java → order-application-service/src/main/java/cn/freemud/service/mccafe/thirdparty/CouponOfflineMCCafeClient.java
package com.freemud.sdk.api.assortment.order.service.thirdparty;
package cn.freemud.service.mccafe.thirdparty;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponQueryResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
import com.freemud.sdk.api.assortment.order.request.coupon.MCCafeCouponLockRequest;
import com.freemud.sdk.api.assortment.order.request.coupon.MCCafeConponRequest;
import cn.freemud.entities.dto.coupon.MCCafeCouponLockRequest;
import cn.freemud.entities.dto.coupon.MCCafeConponRequest;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......
order-application-service/src/test/java/cn.freemud/service/CouponActivityServiceTest.java
......@@ -2,14 +2,16 @@ package cn.freemud.service;
import cn.freemud.OrderApplication;
import cn.freemud.base.constant.Version;
import cn.freemud.entities.dto.coupon.MCCafeConponRequest;
import cn.freemud.entities.dto.coupon.MCCafeCouponLockRequest;
import cn.freemud.entities.dto.coupon.MCCafeProductRedeemVo;
import cn.freemud.entities.dto.coupon.MCCafeTransactionVo;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponQueryResponse;
import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
import com.freemud.sdk.api.assortment.order.enums.CouponReqTypeEnum;
import com.freemud.sdk.api.assortment.order.request.coupon.*;
import com.freemud.sdk.api.assortment.order.service.thirdparty.CouponOfflineMCCafeClient;
import cn.freemud.enums.CouponReqTypeEnum;
import cn.freemud.service.mccafe.thirdparty.CouponOfflineMCCafeClient;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......
order-application-service/src/test/java/cn/freemud/service/impl/OrderCommonServiceTest.java
package cn.freemud.service.impl;
import com.alibaba.fastjson.JSON;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.sdk.api.assortment.order.request.order.ClearTableRequest;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import org.junit.Test;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment