重构

shopping-cart-application-service/src/main/java/cn/freemud/demo/adapter/ServiceBOAdapter.java

 package cn.freemud.demo.adapter;
 
 import cn.freemud.adapter.ShoppingCartConvertAdapter;
+import cn.freemud.demo.entities.AddGoodsShoppingCartBO;
 import cn.freemud.demo.entities.bo.goods.ProductBO;
 import cn.freemud.demo.entities.bo.goods.add.*;
 import cn.freemud.demo.entities.dto.goods.add.*;
@@ -23,7 +24,7 @@ public class ServiceBOAdapter {
         return baseAddGoodsBO;
     }
 
-    public BaseAddGoodsVO convert2AddGoodsVO(String bizType, BaseAddGoodsBO baseAddGoodsBO) {
+    public BaseAddGoodsVO convert2AddGoodsVO(String bizType, AddGoodsShoppingCartBO baseAddGoodsBO) {
         BaseAddGoodsVO baseAddGoodsVO;
         if (BizTypeEnum.MAIL.getCode().equals(bizType)){
             baseAddGoodsVO = createMallVO(baseAddGoodsBO);
@@ -60,17 +61,17 @@ public class ServiceBOAdapter {
         return mallAddGoodsBO;
     }
 
-    private PlatformAddGoodsVO createPlatformVO(BaseAddGoodsBO baseAddGoodsBO) {
+    private PlatformAddGoodsVO createPlatformVO(AddGoodsShoppingCartBO baseAddGoodsBO) {
         PlatformAddGoodsVO platformAddGoodsVO = new PlatformAddGoodsVO();
         return platformAddGoodsVO;
     }
 
-    private MCoffeeAddGoodsVO createMCoffeeVO(BaseAddGoodsBO baseAddGoodsBO) {
+    private MCoffeeAddGoodsVO createMCoffeeVO(AddGoodsShoppingCartBO baseAddGoodsBO) {
         MCoffeeAddGoodsVO mCoffeeAddGoodsVO = new MCoffeeAddGoodsVO();
         return mCoffeeAddGoodsVO;
     }
 
-    private MallAddGoodsVO createMallVO(BaseAddGoodsBO baseAddGoodsBO) {
+    private MallAddGoodsVO createMallVO(AddGoodsShoppingCartBO baseAddGoodsBO) {
         MallAddGoodsVO mallAddGoodsVO = new MallAddGoodsVO();
         return mallAddGoodsVO;
     }

shopping-cart-application-service/src/main/java/cn/freemud/demo/controller/ShoppingCartController.java

@@ -14,6 +14,7 @@ package cn.freemud.demo.controller;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.demo.adapter.ServiceBOAdapter;
+import cn.freemud.demo.entities.AddGoodsShoppingCartBO;
 import cn.freemud.demo.entities.bo.goods.add.BaseAddGoodsBO;
 import cn.freemud.demo.entities.dto.goods.add.BaseAddGoodsVO;
 import cn.freemud.demo.entities.dto.goods.add.AddGoodsRequestDTO;
@@ -40,6 +41,7 @@ import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -49,6 +51,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -70,20 +73,20 @@ public class ShoppingCartController {
      */
     @ApiAnnotation(logMessage = "addGoods")
     @PostMapping(value = "/addGoods")
-    public BaseResponse addGoods(@LogParams @RequestBody Map<String, Object> map) {
-
-        // AddGoodsRequestDTO baseRequestDTO = JSON.parseObject(params, AddGoodsRequestDTO.class);
+    public BaseResponse addGoods(@LogParams @RequestBody Map<String, Object> request) throws InvocationTargetException, IllegalAccessException {
 
+        AddGoodsRequestDTO baseRequestDTO = new AddGoodsRequestDTO();
+        BeanUtils.populate(baseRequestDTO, request);
 
         /**
          * 是否用新字段,还是沿用老逻辑
          */
-        BizTypeEnum bizType = BizTypeUtil.getBizType(baseRequestDTO);
+        BizTypeEnum bizType = BizTypeUtil.getBizType(baseRequestDTO.getPartnerId());
 
         AbstractAddGoodsService addGoodsServiceInstance = ServiceFactory.createAddGoodsServiceInstance(bizType.getCode());
 
         BaseAddGoodsBO addGoodsBOInstance = serviceBOAdapter.convert2AddGoodsBO(bizType.getCode(), baseRequestDTO);
-        BaseAddGoodsBO addGoodsResponseBO = addGoodsServiceInstance.addGoods(addGoodsBOInstance);
+        AddGoodsShoppingCartBO addGoodsResponseBO = addGoodsServiceInstance.addGoods(addGoodsBOInstance);
         BaseAddGoodsVO baseAddGoodsVO = serviceBOAdapter.convert2AddGoodsVO(bizType.getCode(), addGoodsResponseBO);
 
         return ResponseUtil.success(baseAddGoodsVO);

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/AddGoodsShoppingCartBO.java

+package cn.freemud.demo.entities;
+
+public class AddGoodsShoppingCartBO {
+}

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/AddGoodsToShoppingCartBO.java

+package cn.freemud.demo.entities;
+
+public class AddGoodsToShoppingCartBO {
+}

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/CalCostBO.java

+package cn.freemud.demo.entities;
+
+public class CalCostBO {
+}

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/CheckBussinessRulesBO.java

+package cn.freemud.demo.entities;
+
+public class CheckBussinessRulesBO {
+}

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/SetMessageBO.java

+package cn.freemud.demo.entities;
+
+public class SetMessageBO {
+}

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/AbstractAddGoodsService.java

@@ -2,7 +2,7 @@ package cn.freemud.demo.service;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.demo.constant.ResponseConstant;
-import cn.freemud.demo.entities.ResponseBuilder;
+import cn.freemud.demo.entities.*;
 import cn.freemud.demo.entities.bo.goods.ProductBO;
 import cn.freemud.demo.entities.bo.goods.add.BaseAddGoodsBO;
 import cn.freemud.demo.manager.AssortmentSdkManager;
@@ -32,29 +32,26 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
      *
      * @return
      */
-    public final BaseAddGoodsBO addGoods(BaseAddGoodsBO addGoodsBO) {
+    public final AddGoodsShoppingCartBO addGoods(BaseAddGoodsBO addGoodsBO) {
         // 基本参数校验
         this.checkParams(addGoodsBO);
 
         // 获取购物车和加车商品信息
-        this.getShoppingCartInfo(addGoodsBO);
+        CheckBussinessRulesBO checkBussinessRulesBO = this.getShoppingCartInfo(addGoodsBO);
 
         // 业务校验,例如商品数量库存之类的信息
-        this.checkBusinessRules(addGoodsBO);
+        AddGoodsToShoppingCartBO addGoodsToShoppingCartBO = this.checkBusinessRules(addGoodsBO, checkBussinessRulesBO);
 
         // 添加商品到购物车
-        this.addGoodsToShoppingCart(addGoodsBO);
+        CalCostBO calCostBO = this.addGoodsToShoppingCart(addGoodsBO, addGoodsToShoppingCartBO);
 
         // 计算费用,例如配送费
-        this.calCost(addGoodsBO);
+        SetMessageBO setMessageBO = this.calCost(addGoodsBO, calCostBO);
 
         // 提示语设置,例如满减信息
-        this.setMessage(addGoodsBO);
+        AddGoodsShoppingCartBO addGoodsShoppingCartBO = this.setMessage(addGoodsBO, setMessageBO);
 
-        // 拼装返回体
-        this.buildResponse(addGoodsBO);
-
-        return addGoodsBO;
+        return addGoodsShoppingCartBO;
     }
 
     public final BaseResponse checkCommParams(BaseAddGoodsBO baseRequestDTO) {
@@ -66,15 +63,23 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
         return ResponseBuilder.success();
     }
 
-    public final BaseResponse checkCommBusinessRules(BaseAddGoodsBO baseRequestDTO) {
+    public final AddGoodsToShoppingCartBO checkCommBusinessRules(BaseAddGoodsBO baseRequestDTO, CheckBussinessRulesBO checkBussinessRulesBO) {
+        return null;
+    }
+
+    public final CalCostBO commAddGoodsToShoppingCart(BaseAddGoodsBO baseRequestDTO, AddGoodsToShoppingCartBO addGoodsToShoppingCartBO) {
         return null;
     }
 
-    public final BaseResponse calCommCost(BaseAddGoodsBO baseRequestDTO) {
+    public final void updateShoppingCartCache(CalCostBO calCostBO) {
+        return ;
+    }
+
+    public final SetMessageBO calCommCost(BaseAddGoodsBO baseRequestDTO, CalCostBO calCostBO) {
         return null;
     }
 
-    public final BaseResponse setCommMessage(BaseAddGoodsBO baseRequestDTO) {
+    public final AddGoodsShoppingCartBO setCommMessage(BaseAddGoodsBO baseRequestDTO, SetMessageBO setMessageBO) {
         return null;
     }
 
@@ -87,16 +92,12 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
      * @param addGoodsBO
      * @return
      */
-    public final BaseResponse calCost(BaseAddGoodsBO addGoodsBO) {
-        BaseResponse commonBaseResponse = this.calCommCost(addGoodsBO);
-        if (!ResponseConstant.RESPONSE_SUCCESS_STR.equals(commonBaseResponse.getCode())){
-            return commonBaseResponse;
-        }
-        BaseResponse customBaseResponse = this.calCustomCost(addGoodsBO);
-        if (!ResponseConstant.RESPONSE_SUCCESS_STR.equals(customBaseResponse.getCode())){
-            return customBaseResponse;
-        }
-        return ResponseBuilder.success();
+    public final SetMessageBO calCost(BaseAddGoodsBO addGoodsBO, CalCostBO calCostBO) {
+        SetMessageBO commonSetMessageBO = this.calCommCost(addGoodsBO, calCostBO);
+
+        SetMessageBO customSetMessageBO = this.calCustomCost(addGoodsBO, calCostBO, commonSetMessageBO);
+
+        return customSetMessageBO;
     }
 
     /**
@@ -104,16 +105,12 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
      * @param addGoodsBO
      * @return
      */
-    public final BaseResponse setMessage(BaseAddGoodsBO addGoodsBO) {
-        BaseResponse commonBaseResponse = this.setCommMessage(addGoodsBO);
-        if (!ResponseConstant.RESPONSE_SUCCESS_STR.equals(commonBaseResponse.getCode())){
-            return commonBaseResponse;
-        }
-        BaseResponse customBaseResponse = this.setCustomMessage(addGoodsBO);
-        if (!ResponseConstant.RESPONSE_SUCCESS_STR.equals(customBaseResponse.getCode())){
-            return customBaseResponse;
-        }
-        return ResponseBuilder.success();
+    public final AddGoodsShoppingCartBO setMessage(BaseAddGoodsBO addGoodsBO, SetMessageBO setMessageBO) {
+        AddGoodsShoppingCartBO commonAddGoodsShoppingCartBO = this.setCommMessage(addGoodsBO, setMessageBO);
+
+        AddGoodsShoppingCartBO customAddGoodsShoppingCartBO = this.setCustomMessage(addGoodsBO, setMessageBO, commonAddGoodsShoppingCartBO);
+
+        return customAddGoodsShoppingCartBO;
     }
 
 
@@ -139,8 +136,8 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
      *
      * @return
      */
-    public final BaseResponse getShoppingCartInfo(BaseAddGoodsBO baseRequestBO) {
-
+    public final CheckBussinessRulesBO getShoppingCartInfo(BaseAddGoodsBO baseRequestBO) {
+        CheckBussinessRulesBO bo = new CheckBussinessRulesBO();
         String userId = customerManager.getUserId(baseRequestBO.getSessionId());
         baseRequestBO.setUserId(userId);
 
@@ -149,7 +146,7 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
 
 
 
-        return ResponseBuilder.success();
+        return bo;
     }
 
     /**
@@ -157,16 +154,10 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
      *
      * @return
      */
-    public final BaseResponse checkBusinessRules(BaseAddGoodsBO baseRequestDTO) {
-        BaseResponse commonBaseResponse = this.checkCommBusinessRules(baseRequestDTO);
-        if (!ResponseConstant.RESPONSE_SUCCESS_STR.equals(commonBaseResponse.getCode())){
-            return commonBaseResponse;
-        }
-        BaseResponse customBaseResponse = this.checkCustomBusinessRules(baseRequestDTO);
-        if (!ResponseConstant.RESPONSE_SUCCESS_STR.equals(customBaseResponse.getCode())){
-            return customBaseResponse;
-        }
-        return ResponseBuilder.success();
+    public final AddGoodsToShoppingCartBO checkBusinessRules(BaseAddGoodsBO baseRequestDTO, CheckBussinessRulesBO checkBussinessRulesBO) {
+        AddGoodsToShoppingCartBO commAddGoodsToShoppingCartBO = this.checkCommBusinessRules(baseRequestDTO, checkBussinessRulesBO);
+        AddGoodsToShoppingCartBO customAddGoodsToShoppingCartBO = this.checkCustomBusinessRules(baseRequestDTO, checkBussinessRulesBO, commAddGoodsToShoppingCartBO);
+        return customAddGoodsToShoppingCartBO;
     }
 
 
@@ -175,16 +166,15 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
      *
      * @return
      */
-    public final BaseResponse addGoodsToShoppingCart(BaseAddGoodsBO baseRequestDTO) {
-        BaseResponse commonBaseResponse = this.checkCommBusinessRules(baseRequestDTO);
-        if (!ResponseConstant.RESPONSE_SUCCESS_STR.equals(commonBaseResponse.getCode())){
-            return commonBaseResponse;
-        }
-        BaseResponse customBaseResponse = this.checkCustomBusinessRules(baseRequestDTO);
-        if (!ResponseConstant.RESPONSE_SUCCESS_STR.equals(customBaseResponse.getCode())){
-            return customBaseResponse;
-        }
-        return ResponseBuilder.success();
+    public final CalCostBO addGoodsToShoppingCart(BaseAddGoodsBO baseRequestDTO, AddGoodsToShoppingCartBO addGoodsToShoppingCartBO) {
+
+        CalCostBO commCalCostBO = this.commAddGoodsToShoppingCart(baseRequestDTO, addGoodsToShoppingCartBO);
+
+        CalCostBO customCalCostBO = this.customAddGoodsToShoppingCart(baseRequestDTO, addGoodsToShoppingCartBO, commCalCostBO);
+
+        this.updateShoppingCartCache(customCalCostBO);
+
+        return commCalCostBO;
     }
 
     /**

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/AddGoodsService.java

@@ -2,7 +2,7 @@ package cn.freemud.demo.service;
 
 import cn.freemud.adapter.ShoppingCartConvertAdapter;
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.demo.entities.ResponseBuilder;
+import cn.freemud.demo.entities.*;
 import cn.freemud.demo.entities.bo.goods.add.BaseAddGoodsBO;
 import cn.freemud.demo.entities.dto.AddGoodsBaseResponseVO;
 import cn.freemud.demo.manager.CustomerManager;
@@ -25,31 +25,45 @@ public interface AddGoodsService {
         return ResponseBuilder.success();
     }
 
+
+    /**
+     * 获取购物车信息
+     * @param baseRequestDTO
+     * @return
+     */
+    default CheckBussinessRulesBO getShoppingCartInfo(BaseAddGoodsBO baseRequestDTO) {
+        return new CheckBussinessRulesBO();
+    }
+
     /**
      * 进行客制化的业务校验
      * @param baseRequestDTO
      * @return
      */
-    default BaseResponse checkCustomBusinessRules(BaseAddGoodsBO baseRequestDTO) {
-        return ResponseBuilder.success();
+    default AddGoodsToShoppingCartBO checkCustomBusinessRules(BaseAddGoodsBO baseRequestDTO, CheckBussinessRulesBO checkBussinessRulesBO, AddGoodsToShoppingCartBO addGoodsToShoppingCartBO) {
+        return null;
     }
 
+
+
     /**
-     * 获取购物车信息
+     * 购物车赋值
      * @param baseRequestDTO
      * @return
      */
-    default BaseResponse getShoppingCartInfo(BaseAddGoodsBO baseRequestDTO) {
-        return ResponseBuilder.success();
+    default CalCostBO customAddGoodsToShoppingCart(BaseAddGoodsBO baseRequestDTO, AddGoodsToShoppingCartBO addGoodsToShoppingCartBO, CalCostBO customCalCostBO) {
+        return new CalCostBO();
     }
 
+
+
     /**
      * 进行客制化的计算费用
      * @param baseRequestDTO
      * @return
      */
-    default BaseResponse calCustomCost(BaseAddGoodsBO baseRequestDTO) {
-        return ResponseBuilder.success();
+    default SetMessageBO calCustomCost(BaseAddGoodsBO baseRequestDTO, CalCostBO calCostBO, SetMessageBO commonSetMessageBO) {
+        return null;
     }
 
     /**
@@ -57,8 +71,8 @@ public interface AddGoodsService {
      * @param baseRequestDTO
      * @return
      */
-    default BaseResponse setCustomMessage(BaseAddGoodsBO baseRequestDTO) {
-        return ResponseBuilder.success();
+    default AddGoodsShoppingCartBO setCustomMessage(BaseAddGoodsBO baseRequestDTO, SetMessageBO setMessageBO, AddGoodsShoppingCartBO commonAddGoodsShoppingCartBO) {
+        return null;
     }
 
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/utils/BizTypeUtil.java

@@ -9,9 +9,9 @@ public class BizTypeUtil {
     private final static String macafePartnerId = "";
 
 
-    public static BizTypeEnum getBizType (AddGoodsRequestDTO baseRequestDTO){
+    public static BizTypeEnum getBizType (String partnerId){
 
-        if (baseRequestDTO.getPartnerId().equals(macafePartnerId)) {
+        if (macafePartnerId.equals(partnerId)) {
             return BizTypeEnum.MCOFFEE;
         } else {
             return BizTypeEnum.PLATFORM;