Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java

@@ -65,6 +65,12 @@ public class ConfirmOrderRequest extends BaseConfig {
      */
     private String endTransId;
 
+    /**
+     * 取餐码类型
+     */
+    private String mealCodeRule;
+
+
     @Data
     public static class OrderSettlement{
         /**

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -307,6 +307,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setPayRequestNo(confirmOrderRequest.getPayVoucher());
         request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
         request.setOrderCode(confirmOrderRequest.getOrderId());
+        request.setMealCodeRule(confirmOrderRequest.getMealCodeRule());
         // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
         request.setTimeout(getPaySuccessTimeout(confirmOrderRequest,request));
 

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

@@ -425,6 +425,7 @@ public class OrderServiceImpl implements Orderservice {
         var1.setPayTransId(message.getOut_trade_no());
         var1.setOperator(orderBean.getUserName());
         var1.setEndTransId(message.getEndTransId());
+        var1.setMealCodeRule(getMealCodeRule(wxappid));
         if (StringUtils.isNotBlank(payCode)) {
             var1.setPayChannel(payCode);
             var1.setPayChannelName(PayChannel.getByCode(payCode).getDesc());
@@ -447,9 +448,9 @@ public class OrderServiceImpl implements Orderservice {
             //orderRefund(orderBean, "订单异常退款", openid, oid);
             return gson.toJson(message);
         }
+        // TODO 订单序号替换取餐码显示
+        takeCode = payAccessResponse.getData().getTakeCode();
         daySeq = payAccessResponse.getData().getDaySeq();
-        QueryByCodeResponse queryByCodeResponse33 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
-        log.info("queryByCodeResponse33.getResult():{}",queryByCodeResponse33.getResult());
         //TODO 清空购物车
         NewShoppingCartClearDto newShoppingCartClearDto = new NewShoppingCartClearDto();
         newShoppingCartClearDto.setPartnerId(partnerId);
@@ -459,17 +460,6 @@ public class OrderServiceImpl implements Orderservice {
         newShoppingCartClearDto.setSessionId(sessionId);
         newShoppingCartClearDto.setOperationType(1);
         shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
-        //更新取餐码
-        String pickUpGoodNo = orderAdapter.generateTackCode(orderBean.getCompanyId(), orderBean.getShopId());
-        BaseResponse baseResponse = updatePickUpGoodNo(pickUpGoodNo,orderBean,wxappid);
-        if(baseResponse.getCode().equalsIgnoreCase(ResponseResult.SUCCESS.getCode())){
-            payAccessResponse.getData().setTakeCode(pickUpGoodNo);
-        }
-        log.info("====payAccessResponse.getData().getTakeCode():"+payAccessResponse.getData().getTakeCode());
-        // TODO 订单序号替换取餐码显示
-        takeCode = payAccessResponse.getData().getTakeCode();
-        QueryByCodeResponse queryByCodeResponse44 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
-        log.info("queryByCodeResponse44.getResult():{}",queryByCodeResponse44.getResult());
         if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
             String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";
             orderBean.setAddress(storeAddress);
@@ -477,8 +467,6 @@ public class OrderServiceImpl implements Orderservice {
             //发送支付成功模板消息
             this.sendPaySuccessMessage(orderBean);
         }
-        QueryByCodeResponse queryByCodeResponse11 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
-        log.info("queryByCodeResponse11.getResult():{}",queryByCodeResponse11.getResult());
         // 有云打印机 打印小票，杯贴
         try {
             List<AssortmentCloudPrinter> storePrinters = cloudPrinterManager.getStorePrinters(partnerId, storeId);
@@ -500,8 +488,6 @@ public class OrderServiceImpl implements Orderservice {
         } catch (Exception e) {
             LogUtil.error("cloudPrint_error", null, null, e);
         }
-        QueryByCodeResponse queryByCodeResponse22 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
-        log.info("queryByCodeResponse22.getResult():{}",queryByCodeResponse11.getResult());
         //TODO 埋点支付行为
         BuriedPointPaymentRequestDto requestDto = new BuriedPointPaymentRequestDto();
         requestDto.setStoreId(storeId);
@@ -515,8 +501,6 @@ public class OrderServiceImpl implements Orderservice {
         if (StringUtils.isNotBlank(ruleId)) {
             this.activateMemberCard(partnerId, ruleId, oid, userId, storeId, orderBean.getShopName());
         }
-        QueryByCodeResponse queryByCodeResponse = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
-        log.info("queryByCodeResponse.getResult():{}",queryByCodeResponse.getResult());
         //支付回掉成功标记
         redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
         return sendPaySuccessNoticeMessage();
@@ -2996,28 +2980,16 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(responses.getData());
     }
 
-    public BaseResponse updatePickUpGoodNo(String pickUpGoodNo,OrderBean orderBean,String appId){
+
+    public String getMealCodeRule(String appId){
+        String mealCodeRule = "";
         List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = orderAdapter.cacheSelectDefaultPage(appId, "2");
         Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
         AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get("mealCodeRule");
         if(null != refundDeliveryFeeConfig) {
-            String mealCodeRule = refundDeliveryFeeConfig.getAppValue();
-            if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) {
-                //更新db中的取餐码,生成取餐码
-                OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq();
-                relatingCodeReq.setOrderCode(orderBean.getOid());
-                relatingCodeReq.setOperator(orderBean.getCreateUser());
-                relatingCodeReq.setPartnerId(orderBean.getCompanyId());
-                relatingCodeReq.setPickUpGoodsNo(pickUpGoodNo);
-                BaseOrderResponse baseOrderResponse = orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo());
-                if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-                    return ResponseUtil.error(ResponseResult.ACTIVITY_QUERY_ERROR.ORDER_PICK_UP_GOOD_NO);
-                }
-            }else{
-                log.error("mealCodeRule值为:{}",mealCodeRule);
-            }
+            mealCodeRule = refundDeliveryFeeConfig.getAppValue();
         }
-        return ResponseUtil.success();
+        return mealCodeRule;
     }
     /**
      * 获取商户支付超时时间

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/PaySuccessReq.java

@@ -52,4 +52,7 @@ public class PaySuccessReq {
 
     //预订单任务
     private OrderTaskReq orderTask;
+
+    //取餐码生成规则
+    private String mealCodeRule;
 }