支付宝转账升级

admin

2020-06-09 28fafb67d05ea8398f3f5968f37dec86f0e37e67

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java

@@ -34,6 +34,7 @@
import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -65,6 +66,10 @@
   @Resource

   private HongBaoManageService hongBaoManageService;



	
   @Resource	
   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;

	
   @Resource

   private CollectionGoodsV2Service collectionGoodsV2Service;



@@ -197,9 +202,9 @@
      }



      List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page,

            Constant.PAGE_SIZE, goodsType);

            Constant.PAGE_SIZE, goodsType, false);



      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType);

      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType, false);



      JSONObject data = new JSONObject();

      List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();

@@ -228,7 +233,7 @@
            }

         }



         ConfigParamsDTO paramsDTO =  hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

         ConfigParamsDTO paramsDTO =  orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

               acceptData.getVersion());

         



@@ -324,7 +329,7 @@
      }



      List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(uid, acceptData.getDevice(), page,

            20, goodsType);

            20, goodsType, false);



      GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());

      gsonBuilder.excludeFieldsWithoutExposeAnnotation();

@@ -339,12 +344,12 @@
         }

      });



      long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType);

      long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType, false);



      JSONArray array = new JSONArray();

      if (list != null && list.size() > 0) {

         Gson gson = gsonBuilder.create();

         ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

         ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

               acceptData.getVersion());

         for (ScanHistoryV2 sh : list) {

            CommonGoods commonGoods = sh.getCommonGoods();