麦咖啡无库存

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

@@ -82,7 +82,7 @@ public class OrderController {
      * 麦咖啡创建订单
      */
     @ApiAnnotation(logMessage = "createMCCafeOrder")
-    @PostMapping("/createMCCafeOrder")
+    @PostMapping("/mcCafe/createOrder")
     public BaseResponse createOrderMCCafe(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
         return orderAdapterService.createMCCafeOrder(createOrderVo);
     }

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

@@ -505,47 +505,47 @@ public class CheckMCCafeOrder {
         requestDto.setShoppingCartInfoRequestVo(shoppingCartInfoRequestVo);
         //加价购商品 校验放购物车校验
         requestDto.setPremiumExchangeActivity(createOrderVo.getPremiumExchangeActivity());
-//        cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse = shoppingCartClient.getMCCafeShoppingCartGoodsApportionNew(requestDto);
+        cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse = shoppingCartClient.getMCCafeShoppingCartGoodsApportionNew(requestDto);
         //暂时写死测试数据
-        cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse = JSON.parseObject(
-                "{\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>>(){}
-        );
+//        cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse = JSON.parseObject(
+//                "{\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());
             throw new ServiceException(responseResult != null ? responseResult : ResponseResult.SHOPPING_CART_GETINFO_ERROR );

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

@@ -912,7 +912,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         newShoppingCartClearDto.setAppId(wxappid);
         newShoppingCartClearDto.setSessionId(sessionId);
         newShoppingCartClearDto.setOperationType(1);
-        shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
+        shoppingCartClient.clearMCCafeShoppingCart(newShoppingCartClearDto);
         if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
             String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";
             orderBean.setAddress(storeAddress);
@@ -950,10 +950,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         requestDto.setOpenId(orderExtInfoDto != null ? orderExtInfoDto.getOpenid() : "");
         buriedPointService.BuriedPointPayment(requestDto, orderBean);
 
-        // 开通会员卡
-        if (StringUtils.isNotBlank(ruleId)) {
-            this.activateMemberCard(partnerId, ruleId, oid, userId);
-        }
         //支付回掉成功标记
         redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
         return sendPaySuccessNoticeMessage();

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

@@ -121,36 +121,36 @@ public class MCCafeOrderCenterSdkServiceImpl implements MCCafeOrderCenterSdkServ
 
     private BaseOrderResponse updateMCCafeStockAndScore(QueryOrdersResponse.DataBean.OrderBean orderBean, List<CreateOrderProductRequest> products, ActivityUpdateStockRequest updateStockRequest,
                                                   List<CreateOrderAccountRequest> accounts, MqMessageRequest mqMessageRequest, String menuType) {
-        //TODO 转换获取库存信息,扣减库存
-        UpdateStocksRequest updateStocksRequest = orderSdkAdapter.getUpdateProductStock(orderBean, products, StockChangeType.REDUCE,menuType);
-        if (updateStocksRequest != null && CollectionUtils.isNotEmpty(updateStocksRequest.getProductStocks())) {
-            BaseResponse baseResponse = stockSdkService.reducesStocks(updateStocksRequest, "");
-            ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
-                    "updateStock", JSONObject.toJSONString(updateStocksRequest), JSONObject.toJSONString(baseResponse));
-            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
-                //TODO 失败取消订单
-                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null);
-                orderCenterSdkService.orderCancel(cancelOrderRequest);
-                return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "商品库存不足");
-            }
-        }
-        //TODO 扣减活动库存
-        ActivityUpdateStockRequest activityUpdateStockRequest = orderSdkAdapter.convert2ActivityUpdateStockRequest(orderBean, updateStockRequest);
-        if (activityUpdateStockRequest != null && CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock())) {
-            BaseResponse activityResponse = promotionSdkService.subtractStock(activityUpdateStockRequest, "");
-            ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
-                    "subtractStock", JSONObject.toJSONString(activityUpdateStockRequest), JSONObject.toJSONString(activityResponse));
-            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
-                //TODO 失败取消订单,异步冲正库存
-                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
-                orderCenterSdkService.orderCancel(cancelOrderRequest);
-                //失败异步冲正库存，取消订单
-                backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
-                return BaseOrderResponse.getErrorBaseOrderResponse(activityResponse.getCode(), "活动库存不足");
-            }
-        }
+//        //TODO 转换获取库存信息,扣减库存
+//        UpdateStocksRequest updateStocksRequest = orderSdkAdapter.getUpdateProductStock(orderBean, products, StockChangeType.REDUCE,menuType);
+//        if (updateStocksRequest != null && CollectionUtils.isNotEmpty(updateStocksRequest.getProductStocks())) {
+//            BaseResponse baseResponse = stockSdkService.reducesStocks(updateStocksRequest, "");
+//            ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
+//                    "updateStock", JSONObject.toJSONString(updateStocksRequest), JSONObject.toJSONString(baseResponse));
+//            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
+//                //TODO 失败取消订单
+//                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
+//                        AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null);
+//                orderCenterSdkService.orderCancel(cancelOrderRequest);
+//                return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "商品库存不足");
+//            }
+//        }
+//        //TODO 扣减活动库存
+//        ActivityUpdateStockRequest activityUpdateStockRequest = orderSdkAdapter.convert2ActivityUpdateStockRequest(orderBean, updateStockRequest);
+//        if (activityUpdateStockRequest != null && CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock())) {
+//            BaseResponse activityResponse = promotionSdkService.subtractStock(activityUpdateStockRequest, "");
+//            ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
+//                    "subtractStock", JSONObject.toJSONString(activityUpdateStockRequest), JSONObject.toJSONString(activityResponse));
+//            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
+//                //TODO 失败取消订单,异步冲正库存
+//                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
+//                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
+//                orderCenterSdkService.orderCancel(cancelOrderRequest);
+//                //失败异步冲正库存，取消订单
+//                backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
+//                return BaseOrderResponse.getErrorBaseOrderResponse(activityResponse.getCode(), "活动库存不足");
+//            }
+//        }
         // 扣减积分，扣减失败冲正积分返回错误
         UserScoreRequest userScoreRequest = orderSdkAdapter.convent2UserScoreRequest(orderBean, accounts, true);
         if (userScoreRequest != null) {

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

@@ -59,6 +59,15 @@ public interface ShoppingCartClient {
     @PostMapping(value = "/clearCartGoods?lang=zh_CN")
     ShoppingCartBaseResponse clearShoppingCart(@RequestBody NewShoppingCartClearDto request);
 
+
+    /**
+     * 麦咖啡清空购物车
+     * @param request
+     * @return
+     */
+    @PostMapping(value = "/MCoffee/clearCartGoods?lang=zh_CN")
+    ShoppingCartBaseResponse clearMCCafeShoppingCart(@RequestBody NewShoppingCartClearDto request);
+
     /**
      * 删除购物车一个商品
      * @param request
@@ -74,7 +83,7 @@ public interface ShoppingCartClient {
     BaseResponse<ShoppingCartGoodsDto> getShoppingCartGoodsApportionNew(@RequestBody GetShoppingCartGoodsApportionDto getShoppingCartGoodsApportionDto);
 
     /**
-     * 获取购物车详情，包含均摊信息
+     * 麦咖啡获取购物车详情，包含均摊信息
      */
     @PostMapping(value = "/MCoffee/getshoppingcartGoodsApportion?lang=zh_CN")
     BaseResponse<ShoppingCartGoodsDto> getMCCafeShoppingCartGoodsApportionNew(@RequestBody GetShoppingCartGoodsApportionDto getShoppingCartGoodsApportionDto);