订单补贴消息修改

admin

2019-12-12 d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java

@@ -47,6 +47,7 @@
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;

import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;

import com.yeshi.fanli.service.inter.push.DeviceTokenXMService;

import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

@@ -123,6 +124,9 @@
   private DeviceTokenOPPOService deviceTokenOPPOService;



   @Resource

   private DeviceTokenXMService deviceTokenXMService;



   @Resource

   private DeviceTokenVIVOService deviceTokenVIVOService;



   @Resource

@@ -188,7 +192,6 @@
   @Resource

   private UserMoneyDetailService userMoneyDetailService;



	
   /**

    * 新版登录 V1.5.3

    * 

@@ -246,6 +249,7 @@
                  if (active != null) {

                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenXMService.bindUid(active.getId(), uuser.getId());

                  }

               }

            });

@@ -386,16 +390,16 @@
      vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));

      vo.setCsdLink(configService.get("customer_service_link"));



		
      Date now = new Date();

      Date start = new Date(0);

		


      // 返利订单、奖励券提成

      List<UserMoneyDetailTypeEnum> typeFanli = new ArrayList<>();

      typeFanli.add(UserMoneyDetailTypeEnum.fanli);

      typeFanli.add(UserMoneyDetailTypeEnum.orderReward);

      BigDecimal finishMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeFanli, start, now).abs();

		
      BigDecimal finishMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeFanli, start, now)

            .abs();



      // 邀请订单、分享订单、补贴

      List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();

      typeList.add(UserMoneyDetailTypeEnum.share);

@@ -478,7 +482,7 @@
         }

      });

      Gson gson = gsonBuilder.create();

		


      if (!StringUtil.isNullOrEmpty(callback)) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(vo))));

      } else {