Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop

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

@@ -557,13 +557,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         // 测试appId和openid，后面删除，改为实时获取
         paymentRequest.setWxAppId("wx21e254fdcc79dee8");
         paymentRequest.setOpenId("oR0VA5aRRaGpQxaLUPgQqcDHamg4");
+        //麦咖啡不支持svc卡
         if (totalAmount < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
-        } else if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
+        } else if (totalAmount > 0) {
             orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId);
-        } else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
-            //svc卡支付
-            orderPayResponse = svcPay(cardCode, createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo());
         } else {
             // 0元订单如果不需要支付，自定义支付单号
             orderPayResponse = getOrderPayResponse(paymentRequest, createPrepayRequestDto.getFatherOrderBean());
@@ -595,7 +593,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             message.setOpenid(createPrepayRequestDto.getOpenId());
             message.setPlatform_coupon(0);
             message.setMerchant_coupon(0);
-            orderAdapterService.paySuccessCallback(message);
+            //修改为麦咖啡支付成功回调
+            orderAdapterService.mcCafePaySuccessCallback(message);
             return ResponseUtil.success(createOrderResponse);
         }
     }

order-application-service/src/main/java/cn/freemud/service/thirdparty/ShoppingCartClient.java

@@ -85,7 +85,7 @@ public interface ShoppingCartClient {
     /**
      * 麦咖啡获取购物车详情，包含均摊信息
      */
-    @PostMapping(value = "/MCoffee/getshoppingcartGoodsApportion?lang=zh_CN")
+    @PostMapping(value = "/MCoffee/getShoppingCartGoodsApportion?lang=zh_CN")
     BaseResponse<ShoppingCartGoodsDto> getMCCafeShoppingCartGoodsApportionNew(@RequestBody GetShoppingCartGoodsApportionDto getShoppingCartGoodsApportionDto);
 
 }