Merge branch 'featur/20210609-会员信息-zy' into qa

shopping-cart-application-service/src/main/java/cn/freemud/factory/AbstractShoppingCartImpl.java

@@ -23,6 +23,7 @@ import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import cn.freemud.service.thirdparty.StockClient;
 import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.PromotionFactory;
+import com.alibaba.fastjson.JSON;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerStoreDeliveryConfig;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
@@ -123,8 +124,9 @@ public abstract class AbstractShoppingCartImpl implements ShoppingCartNewService
 //        }
         AssortmentCustomerInfoVo customerInfoVo = customerInfoManager.getCustomerInfoByObject(sessionId);
         if(customerInfoVo == null) throw new ServiceException(ResponseResult.NOT_LOGIN);;
-        CustomerInfoVo customerInfoVo1 = new CustomerInfoVo();
-        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
+        String jsonObject = JSON.toJSONString(customerInfoVo);
+        CustomerInfoVo customerInfoVo1 = JSON.parseObject(jsonObject,CustomerInfoVo.class);
+//        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
         return customerInfoVo1;
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/OpenStoreIappWxappConfigServiceImpl.java

@@ -14,6 +14,7 @@ import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.LogUtil;
 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.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.log.ApiLog;
@@ -69,9 +70,10 @@ public class OpenStoreIappWxappConfigServiceImpl implements OpenStoreIappWxappCo
 //        }
 //        return sessionUserInfo.getResult();
         AssortmentCustomerInfoVo customerInfoVo = customerInfoManager.getCustomerInfoByObject(sessionId);
-        if(customerInfoVo == null) throw new ServiceException(ResponseResult.NOT_LOGIN);;
-        CustomerInfoVo customerInfoVo1 = new CustomerInfoVo();
-        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
+        if(customerInfoVo == null) throw new ServiceException(ResponseResult.NOT_LOGIN);
+        String jsonObject = JSON.toJSONString(customerInfoVo);
+        CustomerInfoVo customerInfoVo1 = JSON.parseObject(jsonObject,CustomerInfoVo.class);
+//        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
         return customerInfoVo1;
     }
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java

@@ -921,8 +921,9 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
 //        return sessionUserInfo.getResult();
         AssortmentCustomerInfoVo customerInfoVo = customerInfoManager.getCustomerInfoByObject(sessionId);
         if(customerInfoVo == null) throw new ServiceException(ResponseResult.NOT_LOGIN);;
-        CustomerInfoVo customerInfoVo1 = new CustomerInfoVo();
-        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
+        String jsonObject = JSON.toJSONString(customerInfoVo);
+        CustomerInfoVo customerInfoVo1 = JSON.parseObject(jsonObject,CustomerInfoVo.class);
+//        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
         return customerInfoVo1;
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java

@@ -22,6 +22,7 @@ import cn.freemud.service.ShoppingCartNewService;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import cn.freemud.utils.*;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
@@ -709,8 +710,9 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
 //        return sessionUserInfo.getResult();
         AssortmentCustomerInfoVo customerInfoVo = customerInfoManager.getCustomerInfoByObject(sessionId);
         if(customerInfoVo == null) return null;
-        CustomerInfoVo customerInfoVo1 = new CustomerInfoVo();
-        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
+        String jsonObject = JSON.toJSONString(customerInfoVo);
+        CustomerInfoVo customerInfoVo1 = JSON.parseObject(jsonObject,CustomerInfoVo.class);
+//        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
         return customerInfoVo1;
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -1877,8 +1877,9 @@ public class ShoppingCartMCoffeeServiceImpl {
         AssortmentCustomerInfoVo customerInfoVo = customerInfoManager.getCustomerInfoByObject(sessionId);
         if (customerInfoVo == null)
             throw new ServiceException(ResponseResult.NOT_LOGIN);
-        CustomerInfoVo customerInfoVo1 = new CustomerInfoVo();
-        BeanUtil.convertBean(customerInfoVo, customerInfoVo1);
+        String jsonObject = JSON.toJSONString(customerInfoVo);
+        CustomerInfoVo customerInfoVo1 = JSON.parseObject(jsonObject,CustomerInfoVo.class);
+//        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
         return customerInfoVo1;
     }