push

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java

@@ -1032,7 +1032,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO();
         CommissionExpectedStatisticsVO vo = new CommissionExpectedStatisticsVO();
         vo.setTotalAmount(totalAmount);
         vo.setTotalAmount(totalAmount);
         vo.setTotalPaidAmount(totalPaidAmount);
         vo.setTotalPaidAmount(totalPaidAmount);
-        vo.setPendingPaidAmount(totalAmount.subtract(totalPaidAmount));
+        vo.setPendingPaidAmountS(totalAmount.subtract(totalPaidAmount));
 
 
         if (totalAmount.compareTo(BigDecimal.ZERO) > 0) {
         if (totalAmount.compareTo(BigDecimal.ZERO) > 0) {
             BigDecimal ratio = totalPaidAmount.divide(totalAmount, 4, RoundingMode.HALF_UP)
             BigDecimal ratio = totalPaidAmount.divide(totalAmount, 4, RoundingMode.HALF_UP)

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedStatisticsVO.java

@@ -30,6 +30,12 @@ public class CommissionExpectedStatisticsVO {
     private BigDecimal pendingPaidAmount;
     private BigDecimal pendingPaidAmount;
 
 
     /**
     /**
+     * 待入账金额（HKD）（实）
+     */
+//    @Schema(description = "待入账金额（HKD）")
+    private BigDecimal pendingPaidAmountS;
+
+    /**
      * 已入账比例 %（已入账金额/总金额）
      * 已入账比例 %（已入账金额/总金额）
      */
      */
 //    @Schema(description = "已入账比例 %（已入账金额/总金额）")
 //    @Schema(description = "已入账比例 %（已入账金额/总金额）")

yd-csf-service/src/main/resources/mappers/CommissionMapper.xml

@@ -56,8 +56,7 @@
             <foreach collection="list" item="item">
             <foreach collection="list" item="item">
                 WHEN #{item.id} THEN #{item.status}
                 WHEN #{item.id} THEN #{item.status}
             </foreach>
             </foreach>
-            END,
-            update_time = NOW()
+            END
         </set>
         </set>
         WHERE id IN
         WHERE id IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
         <foreach collection="list" item="item" open="(" separator="," close=")">