Merge remote-tracking branch 'origin/feature-2020/8/6-McCafe-会阳' into feature-2020/8/6-McCafe-会阳

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

@@ -2612,6 +2612,7 @@ public class OrderServiceImpl implements Orderservice {
         OrderRemindRequestDto dto =new OrderRemindRequestDto();
         dto.setOrderKey(reminderVo.getOid());
         dto.setStoreId(userLoginInfoDto.getStoreId());
+        dto.setDeliveryChannel("CanDao");
         QueryDeliveryAmountResponseDto responseDto = deliveryFeiginClient.orderRemind(dto);
         if(responseDto == null || RESPONSE_SUCCESS_CODE != responseDto.getCode() ) {
             return ResponseUtil.error(ResponseResult.DELIVERY_REMINDER_ERROR);

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -167,28 +167,30 @@ public class OrderManagerAdapter {
         OrderStatus orderStatus = OrderStatus.getByCode(orderBean.getStatus());
         if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(),result.getCode())){
             OperateType byOpType = OperateType.getByOpType(request.getOperateType());
-            switch (byOpType) {
-                case ORDER_CONFIRM:
-                    orderStatus=OrderStatus.RECEIPT;
-                    break;
-                case ORDER_DONE:
-                    orderStatus=OrderStatus.COMPLETE_MAKE;
-                    break;
-                case ORDER_SEND:
-                    orderStatus=OrderStatus.DISTRIBUTION;
-                    break;
-                case ORDER_AFFIRM:
-                    orderStatus=OrderStatus.COMPLETE;
-                    break;
-                case ORDER_REJECT:
-                case ORDER_AGREE_REFUND:
-                    orderStatus=OrderStatus.CANCEL;
-                    refundStatus=RefundStatus.COMPLETE_REFUND;
-                    break;
-                case ORDER_REJECT_REFUND:
-                    refundStatus=RefundStatus.REFUSE_REFUND;
-                    break;
-                default:
+            if (byOpType != null) {
+                switch (byOpType) {
+                    case ORDER_CONFIRM:
+                        orderStatus = OrderStatus.RECEIPT;
+                        break;
+                    case ORDER_DONE:
+                        orderStatus = OrderStatus.COMPLETE_MAKE;
+                        break;
+                    case ORDER_SEND:
+                        orderStatus = OrderStatus.DISTRIBUTION;
+                        break;
+                    case ORDER_AFFIRM:
+                        orderStatus = OrderStatus.COMPLETE;
+                        break;
+                    case ORDER_REJECT:
+                    case ORDER_AGREE_REFUND:
+                        orderStatus = OrderStatus.CANCEL;
+                        refundStatus = RefundStatus.COMPLETE_REFUND;
+                        break;
+                    case ORDER_REJECT_REFUND:
+                        refundStatus = RefundStatus.REFUSE_REFUND;
+                        break;
+                    default:
+                }
             }
             return ResponseUtil.success(new OrderManagerResponse(orderStatus,refundStatus));
         }

order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java

@@ -14,20 +14,20 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public interface CouponOfflineMCCafeClient {
 
     // 核销优惠券
-    @PostMapping("/mccafe/redeem")
+    @PostMapping("/mccafe1/redeem")
     CouponRedeemResponse redeem(MCCafeCouponRequest mcCafeConponRequest);
 
-    @PostMapping("/mccafe/cancelRedeem")
+    @PostMapping("/mccafe1/cancelRedeem")
     CouponRedeemResponse cancelRedeem(MCCafeCouponRequest mcCafeConponRequest);
 
-    @PostMapping("/mccafe/query")
+    @PostMapping("/mccafe1/query")
     CouponQueryResponse query(MCCafeCouponRequest mcCafeConponRequest);
 
     // 优惠券锁定
-    @PostMapping("/mccafe/lock")
+    @PostMapping("/mccafe1/lock")
     CouponBaseResponse lock(MCCafeCouponLockRequest MCCafeCouponLockRequest);
 
     //优惠券解锁
-    @PostMapping("/mccafe/unlock")
+    @PostMapping("/mccafe1/unlock")
     CouponBaseResponse unlock(MCCafeCouponLockRequest MCCafeCouponLockRequest);
 }