初步提交代码,用于测试

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -30,7 +30,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -36,10 +36,7 @@ import org.springframework.stereotype.Service;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.ValidatorFactory;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -69,6 +66,12 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
     private String mcCafePartnerId;
 
     /**
+     * 商户号,用于测试 新接口
+     */
+    @Value("${canal.es.sync.partnerId}")
+    private List<String> partnerIds;
+
+    /**
      * 创单锁定的key
      */
     @Value("${create.order.key.expire:5}")
@@ -102,13 +105,16 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
     private String autoRefundClient;
 
 
-
     @Override
     public BaseResponse createOrderNew(CreateOrderVo createOrderVo) {
         AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(createOrderVo.getSessionId());
         if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
         }
+        // 用于测试 新创建订单接口
+        if (!partnerIds.isEmpty() && partnerIds.contains(assortmentCustomerInfoVo.getPartnerId())) {
+            this.createOrderUniversal(com.freemud.application.sdk.api.util.MapUtils.java2Map(createOrderVo));
+        }
         // 扩展字段中存储 sessionKey
         createOrderVo.setSessionKey(assortmentCustomerInfoVo.getSessionKey());
         if (IappIdType.WC_XCX.getCode().equals(assortmentCustomerInfoVo.getIappId())) {  //i围餐
@@ -175,6 +181,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             //LockUtils.unlock(redisCache.getRedisTemplate(),createOrderKey);
         }
     }
+
     @Override
     public BaseResponse createOrderUniversal(Map<String, Object> param) {
         if (param.isEmpty()) {
@@ -182,7 +189,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         }
         // 商户逻辑判断  共同代码  begin
         String sessionId = (String) param.get("sessionId");
-        if(StringUtils.isBlank(sessionId)) {
+        if (StringUtils.isBlank(sessionId)) {
             throw new ServiceException(ResponseResult.SESSION_INVAILD);
         }
         AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(sessionId);
@@ -201,7 +208,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         String createOrderKey = CREATE_ORDER_KEY + assortmentCustomerInfoVo.getMemberId();
         try {
             Long expire = Long.valueOf(createOrderKeyExpire);
-            if(!LockUtils.lock(redisCache.getRedisTemplate(),createOrderKey,expire)){
+            if (!LockUtils.lock(redisCache.getRedisTemplate(), createOrderKey, expire)) {
                 return ResponseUtil.error(ResponseResult.ORDER_NOT_CREATE_ERROR);
             }
             return createOrderServiceFactory.getCreateOrderService(createOrderScene).createOrder(createOrderBaseVo, assortmentCustomerInfoVo, createOrderScene);
@@ -218,7 +225,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
                 .failFast(false);
         ValidatorFactory validatorFactory = configuration.buildValidatorFactory();
         Set<ConstraintViolation<CreateOrderBaseVo>> set = validatorFactory.getValidator().validate(createOrderBaseVo);
-        if(CollectionUtils.isNotEmpty(set)) {
+        if (CollectionUtils.isNotEmpty(set)) {
             Iterator<ConstraintViolation<CreateOrderBaseVo>> iterator = set.iterator();
             if (iterator.hasNext()) {
                 ConstraintViolation<CreateOrderBaseVo> constraintViolation = iterator.next();
@@ -328,7 +335,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
              * app订单处理
              */
             if (OrderSourceType.APP.getCode().equals(orderBean.getSource())) {
-                if(orderBean.getBizType() == 6){
+                if (orderBean.getBizType() == 6) {
                     return sellCouponOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
                 }
                 return appOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
@@ -402,7 +409,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         if (UserLoginChannelEnum.APP.getCode().equals(assortmentCustomerInfoVo.getChannel())) {
             return appOrderService.createOrder(createOrderVo, assortmentCustomerInfoVo);
         }
-       return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
+        return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
     }
 
     /**