重构入参map

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

@@ -14,6 +14,7 @@ package cn.freemud.controller;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.demo.controller.ShoppingCartDemoController;
+import cn.freemud.demo.entities.dto.goods.add.AddGoodsRequestDTO;
 import cn.freemud.entities.dto.GetMemberInfoRequestDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.OrderChannelType;
@@ -34,6 +35,7 @@ import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.Api;
+import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +47,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.Map;
 
 @RestController
@@ -60,6 +63,9 @@ public class ShoppingCartController {
     @Autowired
     private ShoppingCartDemoController shoppingCartDemoController;
 
+    @Resource
+    private MapperFacade mapperFacade;
+
     /**
      * 从微信卡券向购物车中添加商品
      */
@@ -76,7 +82,7 @@ public class ShoppingCartController {
     @PostMapping(value = "/addGoods")
     public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
         if (SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(request.getPartnerId(), request.getShopId())){
-            Map<String, Object> requestMap = (Map<String, Object>) JSON.toJSON(request);
+            Map requestMap = mapperFacade.map(request, Map.class);
             return shoppingCartDemoController.addGoods(requestMap);
         } else {
             return getInstanceByRequest(request).addGoods(request);
@@ -90,7 +96,7 @@ public class ShoppingCartController {
     @PostMapping(value = "/updateGoodsQty")
     public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
         if (SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(request.getPartnerId(), request.getShopId())){
-            Map<String, Object> requestMap = (Map<String, Object>) JSON.toJSON(request);
+            Map requestMap = mapperFacade.map(request, Map.class);
             return shoppingCartDemoController.updateGoodsQty(requestMap);
         } else {
             return getInstanceByRequest(request).updateGoodsQty(request);

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

@@ -16,6 +16,7 @@ import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.demo.adapter.service.*;
 import cn.freemud.demo.entities.*;
 import cn.freemud.demo.entities.bo.goods.add.BaseAddGoodsBO;
+import cn.freemud.demo.entities.bo.goods.add.PlatformAddGoodsBO;
 import cn.freemud.demo.entities.bo.goods.list.ListCartGoodsBO;
 import cn.freemud.demo.entities.bo.goods.update.UpdateAddGoodsBO;
 import cn.freemud.demo.entities.bo.goods.update.UpdateAddGoodsVO;
@@ -40,7 +41,9 @@ import cn.freemud.service.impl.ShoppingCartMallServiceImpl;
 import cn.freemud.service.impl.ShoppingCartMealServiceImpl;
 import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
 import cn.freemud.service.impl.ShoppingCartToolsServiceImpl;
+import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.ResponseUtil;
+import com.alibaba.fastjson.JSON;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
@@ -49,6 +52,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 ma.glasnost.orika.MapperFacade;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +63,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
@@ -95,6 +100,9 @@ public class ShoppingCartDemoController {
     @Autowired
     private ApportionVOAdapter apportionVOAdapter;
 
+    @Resource
+    private MapperFacade mapperFacade;
+
     /**
      * 向购物车中添加商品
      */
@@ -102,12 +110,7 @@ public class ShoppingCartDemoController {
     @PostMapping(value = "/addGoods")
     public BaseResponse addGoods(@LogParams @RequestBody Map<String, Object> request) {
 
-        AddGoodsRequestDTO baseRequestDTO = new AddGoodsRequestDTO();
-        try {
-            BeanUtils.populate(baseRequestDTO, request);
-        } catch (Exception exception){
-            return ResponseUtil.error("");
-        }
+        AddGoodsRequestDTO baseRequestDTO = mapperFacade.map(request, AddGoodsRequestDTO.class);
 
         /**
          * 是否用新字段,还是沿用老逻辑