更新agent_income_summary中的content内字段名称

pom.xml

@@ -113,7 +113,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.58</version>
+            <version>1.2.60</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
         <dependency>
@@ -145,7 +145,7 @@
             <id>dev</id>
             <properties>
                 <profiles.active>dev</profiles.active>
-                <mysql.server>jdbc:mysql://10.9.121.204:3306/huhu</mysql.server>
+                <mysql.server>jdbc:mysql://10.9.121.204:3306/huhu_finance</mysql.server>
                 <mysql.username>yanfa</mysql.username>
                 <mysql.password>cScdKw%ZKC1i$C!1uAz3Kg$c</mysql.password>
                 <!--<mysql.username>apihu</mysql.username>-->
@@ -277,6 +277,14 @@
 
     <repositories>
         <repository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
             <id>spring-snapshots</id>
             <name>Spring Snapshots</name>
             <url>https://repo.spring.io/snapshot</url>
@@ -292,6 +300,17 @@
     </repositories>
     <pluginRepositories>
         <pluginRepository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
             <id>spring-snapshots</id>
             <name>Spring Snapshots</name>
             <url>https://repo.spring.io/snapshot</url>

src/main/java/com/lanren/huhu/partner/model/AgentSettle.java

@@ -30,15 +30,15 @@ public class AgentSettle extends BaseModel {
     private BigDecimal pingtuiBalance;
     private BigDecimal tax;
 
-    private BigDecimal cashPlace;
-    private int numPlace;
-    private BigDecimal cashRecharge;
-    private int numRecharge;
-    private BigDecimal cashOpenCard;
-    private int numOpenCard;
-    private BigDecimal cashUpgradePartner;
-    private int numUpgradePartner;
+    private BigDecimal placeCash;
+    private int placeNum;
+    private BigDecimal onlinerechargeCash;
+    private int onlinerechargeNum;
+    private BigDecimal openCardCash;
+    private int openCardNum;
+    private BigDecimal upgradePartnerCash;
+    private int upgradePartnerNum;
     private BigDecimal marketPerformance;
-    private BigDecimal cashUpgradeMarket;
-    private BigDecimal cashRechargeMarket;
+    private BigDecimal upgradeMarketCash;
+    private BigDecimal rechargeMarketCash;
 }

src/main/java/com/lanren/huhu/partner/model/AgentSummaryContent.java

@@ -9,22 +9,21 @@ import java.math.BigDecimal;
  * @author chen
  * @title: AgentSummaryContent
  * @projectName partner
- * @description: TODO
  * @package com.lanren.huhu.partner.model
  * @date 2019-08-21 16:26
  */
 @Data
 public class AgentSummaryContent extends BaseModel {
-    private BigDecimal cashPlace;
-    private int numPlace;
-    private BigDecimal cashRecharge;
-    private int numRecharge;
-    private BigDecimal cashOpenCard;
-    private int numOpenCard;
-    private BigDecimal cashUpgradePartner;
-    private int numUpgradePartner;
+    private BigDecimal placeCash; //购物奖励金额
+    private int placeNum; //购物数量
+    private BigDecimal onlinerechargeCash; //在线充值奖励金额
+    private int onlinerechargeNum; //在线充值数量
+    private BigDecimal opencardCash; //开卡充值奖励汇总
+    private int opencardNum; //开卡充值条数
+    private BigDecimal upgradePartnerCash; //会员升级奖励金额
+    private int upgradePartnerNum; //会员升级数量
     private BigDecimal marketPerformance;
-    private BigDecimal cashUpgradeMarket;
-    private BigDecimal cashRechargeMarket;
-    private int expandUsers;
+    private BigDecimal upgradeMarketCash;
+    private BigDecimal rechargeMarketCash;
+    private int expandUsers; //拓展用户数量
 }

src/main/java/com/lanren/huhu/partner/schedule/AgentSettleTask.java

@@ -416,16 +416,18 @@ public class AgentSettleTask {
     /**
      * money 面额(message里, 需要上供的代理商自己获得的奖励)
      * commission_account 面额
+     * cash_code 支付金额
      * amount 奖励金额
      * commission 奖励金额
-     * cash_code 支付金额
      */
     private void add2UpdateReward2Failed(AgentReward agentReward, List<AgentReward> update2FailedList) {
+        if (agentReward.getAmount().compareTo(BigDecimal.ZERO) >= 0) {
+            agentReward.setMoney(ZERO);
+            agentReward.setCommissionAcount(ZERO);
+            agentReward.setAmount(ZERO);
+            agentReward.setCommission(ZERO);
+        }
         agentReward.setAllMoneyOri(ZERO);
-        agentReward.setMoney(ZERO);
-        agentReward.setCommissionAcount(ZERO);
-        agentReward.setAmount(ZERO);
-        agentReward.setCommission(ZERO);
         agentReward.setCashCode("0");
         agentReward.setSettleState(Constants.SETTLE_STATE_FAILED);
         agentReward.setUpdatedAt(System.currentTimeMillis() / 1000L);
@@ -545,17 +547,17 @@ public class AgentSettleTask {
          * 生成content字段
          */
         AgentSummaryContent agentSummaryContent = new AgentSummaryContent();
-        agentSummaryContent.setCashPlace(agentSettle.getCashPlace().setScale(2, RoundingMode.HALF_UP));
-        agentSummaryContent.setNumPlace(agentSettle.getNumPlace());
-        agentSummaryContent.setCashRecharge(agentSettle.getCashRecharge().setScale(2, RoundingMode.HALF_UP));
-        agentSummaryContent.setNumRecharge(agentSettle.getNumRecharge());
-        agentSummaryContent.setCashOpenCard(agentSettle.getCashOpenCard().setScale(2, RoundingMode.HALF_UP));
-        agentSummaryContent.setNumOpenCard(agentSettle.getNumOpenCard());
-        agentSummaryContent.setCashUpgradePartner(agentSettle.getCashUpgradePartner().setScale(2, RoundingMode.HALF_UP));
-        agentSummaryContent.setNumUpgradePartner(agentSettle.getNumUpgradePartner());
+        agentSummaryContent.setPlaceCash(agentSettle.getPlaceCash().setScale(2, RoundingMode.HALF_UP));
+        agentSummaryContent.setPlaceNum(agentSettle.getPlaceNum());
+        agentSummaryContent.setOnlinerechargeCash(agentSettle.getOnlinerechargeCash().setScale(2, RoundingMode.HALF_UP));
+        agentSummaryContent.setOnlinerechargeNum(agentSettle.getOnlinerechargeNum());
+        agentSummaryContent.setOpencardCash(agentSettle.getOpenCardCash().setScale(2, RoundingMode.HALF_UP));
+        agentSummaryContent.setOpencardNum(agentSettle.getOpenCardNum());
+        agentSummaryContent.setUpgradePartnerCash(agentSettle.getUpgradePartnerCash().setScale(2, RoundingMode.HALF_UP));
+        agentSummaryContent.setUpgradePartnerNum(agentSettle.getUpgradePartnerNum());
         agentSummaryContent.setMarketPerformance(agentSettle.getMarketPerformance().setScale(2, RoundingMode.HALF_UP));
-        agentSummaryContent.setCashUpgradeMarket(agentSettle.getCashUpgradeMarket().setScale(2, RoundingMode.HALF_UP));
-        agentSummaryContent.setCashRechargeMarket(agentSettle.getCashRechargeMarket().setScale(2, RoundingMode.HALF_UP));
+        agentSummaryContent.setUpgradeMarketCash(agentSettle.getUpgradeMarketCash().setScale(2, RoundingMode.HALF_UP));
+        agentSummaryContent.setRechargeMarketCash(agentSettle.getRechargeMarketCash().setScale(2, RoundingMode.HALF_UP));
         Integer expandUsers = agentExpandDailyService.getMonthCntByAgent(agentSettle.getAgentId(), beginTs, endTs);
         expandUsers = expandUsers == null ? 0 : expandUsers;
         agentSummaryContent.setExpandUsers(expandUsers);
@@ -563,10 +565,10 @@ public class AgentSettleTask {
          * 生成income字段
          */
         BigDecimal sum1 = agentSettle.getBalance();
-        BigDecimal sum2 = agentSettle.getCashPlace()
-                .add(agentSettle.getCashRecharge())
-                .add(agentSettle.getCashOpenCard())
-                .add(agentSettle.getCashUpgradePartner());
+        BigDecimal sum2 = agentSettle.getPlaceCash()
+                .add(agentSettle.getOnlinerechargeCash())
+                .add(agentSettle.getOpenCardCash())
+                .add(agentSettle.getUpgradePartnerCash());
         if (sum1.compareTo(sum2) != 0) {
             logger.error("代理商奖励结算-对账异常: 求和1:{}, 求和2:{}, 奖励字段:{}", sum1, sum2, agentSettle);
             throw new RuntimeException();

src/main/java/com/lanren/huhu/partner/schedule/PartnerSettleTask.java

@@ -375,9 +375,11 @@ public class PartnerSettleTask {
      * @param partnerReward
      */
     private void add2UpdateReward2Failed(PartnerReward partnerReward, List<PartnerReward> update2FailedList) {
+        if (partnerReward.getCommissionAcount().compareTo(BigDecimal.ZERO) >= 0) {
+            partnerReward.setCommissionAcount(ZERO);
+        }
         partnerReward.setAllMoneyOri(ZERO);
         partnerReward.setCash(ZERO);
-        partnerReward.setCommissionAcount(ZERO);
         partnerReward.setSettleState(Constants.SETTLE_STATE_FAILED);
         partnerReward.setUpdatedAt(System.currentTimeMillis() / 1000L);
 //        partnerRewardService.updateById(partnerReward);

src/main/resources/mapper/AgentRewardMapper.xml

@@ -678,17 +678,17 @@
     a.zigoushengBalance,
     a.pingtuiBalance,
     0 tax,
-    a.cash_place,
-    a.num_place,
-    a.cash_recharge,
-    a.num_recharge,
-    a.cash_open_card,
-    a.num_open_card,
-    a.cash_upgrade_partner,
-    a.num_upgrade_partner,
+    a.place_cash,
+    a.place_num,
+    a.recharge_cash,
+    a.recharge_num,
+    a.open_card_cash,
+    a.open_card_num,
+    a.upgrade_partner_cash,
+    a.upgrade_partner_num,
     a.marketPerformance,
-    a.cash_upgrade_market,
-    a.cash_recharge_market
+    a.upgrade_market_cash,
+    a.recharge_market_cash
     FROM (
         SELECT
             agent_id,
@@ -703,17 +703,17 @@
             SUM(case when reward_type in (60,760) then amount else 0 end) shareBalance,
             SUM(case when reward_type in (300,750) then amount else 0 end) zigoushengBalance,
             SUM(0) pingtuiBalance,
-            SUM(if(reward_type IN (60, 750, 300, 760),amount, 0)) AS cash_place,
-            COUNT(reward_type IN (60, 750, 300, 760) OR NULL) AS num_place,
-            SUM(if(reward_type IN (50, 740),amount, 0)) AS cash_recharge,
-            COUNT(reward_type IN (50, 740) OR NULL) AS num_recharge,
-            SUM(if(reward_type=40, amount, 0)) AS cash_open_card,
-            COUNT(reward_type=40 OR NULL) AS num_open_card,
-            SUM(if(reward_type IN (30, 20, 710, 720, 730),amount, 0)) AS cash_upgrade_partner,
-            COUNT(reward_type IN (30, 20, 710, 720, 730) OR NULL) AS num_upgrade_partner,
+            SUM(if(reward_type IN (60, 750, 300, 760),amount, 0)) AS place_cash,
+            COUNT(reward_type IN (60, 750, 300, 760) OR NULL) AS place_num,
+            SUM(if(reward_type IN (50, 740),amount, 0)) AS recharge_cash,
+            COUNT(reward_type IN (50, 740) OR NULL) AS recharge_num,
+            SUM(if(reward_type=40, amount, 0)) AS open_card_cash,
+            COUNT(reward_type=40 OR NULL) AS open_card_num,
+            SUM(if(reward_type IN (30, 20, 710, 720, 730),amount, 0)) AS upgrade_partner_cash,
+            COUNT(reward_type IN (30, 20, 710, 720, 730) OR NULL) AS upgrade_partner_num,
             SUM(if(reward_type IN (50, 30, 20),cash_code, 0)) AS marketPerformance,
-            SUM(if(reward_type IN (30, 20),cash_code, 0)) AS cash_upgrade_market,
-            SUM(if(reward_type=50, cash_code, 0)) AS cash_recharge_market
+            SUM(if(reward_type IN (30, 20),cash_code, 0)) AS upgrade_market_cash,
+            SUM(if(reward_type=50, cash_code, 0)) AS recharge_market_cash
         FROM agent_reward
         WHERE recharge_time
         BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
@@ -740,17 +740,17 @@
     a.zigoushengBalance,
     a.pingtuiBalance,
     0 tax,
-    a.cash_place,
-    a.num_place,
-    a.cash_recharge,
-    a.num_recharge,
-    a.cash_open_card,
-    a.num_open_card,
-    a.cash_upgrade_partner,
-    a.num_upgrade_partner,
+    a.place_cash,
+    a.place_num,
+    a.recharge_cash,
+    a.recharge_num,
+    a.open_card_cash,
+    a.open_card_num,
+    a.upgrade_partner_cash,
+    a.upgrade_partner_num,
     a.marketPerformance,
-    a.cash_upgrade_market,
-    a.cash_recharge_market
+    a.upgrade_market_cash,
+    a.recharge_market_cash
     FROM (
         SELECT
             agent_id,
@@ -765,17 +765,17 @@
             SUM(case when reward_type in (60,760) then amount else 0 end) shareBalance,
             SUM(case when reward_type in (300,750) then amount else 0 end) zigoushengBalance,
             SUM(0) pingtuiBalance,
-            SUM(if(reward_type IN (60, 750, 300, 760),amount, 0)) AS cash_place,
-            COUNT(reward_type IN (60, 750, 300, 760) OR NULL) AS num_place,
-            SUM(if(reward_type IN (50, 740),amount, 0)) AS cash_recharge,
-            COUNT(reward_type IN (50, 740) OR NULL) AS num_recharge,
-            SUM(if(reward_type=40, amount, 0)) AS cash_open_card,
-            COUNT(reward_type=40 OR NULL) AS num_open_card,
-            SUM(if(reward_type IN (30, 20, 710, 720, 730),amount, 0)) AS cash_upgrade_partner,
-            COUNT(reward_type IN (30, 20, 710, 720, 730) OR NULL) AS num_upgrade_partner,
+            SUM(if(reward_type IN (60, 750, 300, 760),amount, 0)) AS place_cash,
+            COUNT(reward_type IN (60, 750, 300, 760) OR NULL) AS place_num,
+            SUM(if(reward_type IN (50, 740),amount, 0)) AS recharge_cash,
+            COUNT(reward_type IN (50, 740) OR NULL) AS recharge_num,
+            SUM(if(reward_type=40, amount, 0)) AS open_card_cash,
+            COUNT(reward_type=40 OR NULL) AS open_card_num,
+            SUM(if(reward_type IN (30, 20, 710, 720, 730),amount, 0)) AS upgrade_partner_cash,
+            COUNT(reward_type IN (30, 20, 710, 720, 730) OR NULL) AS upgrade_partner_num,
             SUM(if(reward_type IN (50, 30, 20),cash_code, 0)) AS marketPerformance,
-            SUM(if(reward_type IN (30, 20),cash_code, 0)) AS cash_upgrade_market,
-            SUM(if(reward_type=50, cash_code, 0)) AS cash_recharge_market
+            SUM(if(reward_type IN (30, 20),cash_code, 0)) AS upgrade_market_cash,
+            SUM(if(reward_type=50, cash_code, 0)) AS recharge_market_cash
         FROM agent_reward
         WHERE recharge_time
         BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})

src/main/resources/static/sql.log

@@ -207,4 +207,13 @@ round(JSON_EXTRACT(content, '$.cash')+JSON_EXTRACT(content, '$.upCash')+JSON_EXT
 select
 user_id,
 wx_free_balance
-from partner_account
+from partner_account
\ No newline at end of file
+
+
+
+
+ALTER TABLE `huhu`.`partner_reward`
+ADD COLUMN `settle_time` datetime(0) NULL COMMENT '结算奖励的时间: 淘宝客/京东联盟为确认收货时间, 其他类型奖励同于recharge_time' AFTER `tech_fee_rate`;
+
+ALTER TABLE `huhu`.`agent_reward`
+ADD COLUMN `settle_time` datetime(0) NULL COMMENT '结算奖励的时间: 淘宝客/京东联盟为确认收货时间, 其他类型奖励同于recharge_time' AFTER `ratio_all`;