Merge remote-tracking branch 'origin/test' into test

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyDto.java

@@ -56,9 +56,5 @@ public class TbMerchantThirdApplyDto implements Serializable {
     /** shopId */
     private Integer shopId;
 
-    private String alipayAppId;
-
-    private String alipayAppToken;
-
     private String alipaySmallAppid;
 }

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantThirdApply.java

@@ -49,11 +49,6 @@ public class TbMerchantThirdApply implements Serializable {
     @Column(name = "`app_id`",unique = true)
     @ApiModelProperty(value = "商户应用")
     private String appId;
-
-    @Column(name = "`alipay_app_id`",unique = true)
-    @ApiModelProperty(value = "支付宝商户应用")
-    private String alipayAppId;
-
     @Column(name = "`small_appid`")
     @ApiModelProperty(value = "微信小程序appid")
     private String smallAppid;
@@ -70,10 +65,6 @@ public class TbMerchantThirdApply implements Serializable {
     @ApiModelProperty(value = "商户token")
     private String appToken;
 
-    @Column(name = "`alipay_app_token`")
-    @ApiModelProperty(value = "支付宝商户token")
-    private String alipayAppToken;
-
     @Column(name = "`status`")
     @ApiModelProperty(value = "审核详情-1未提交，0已提交（不可修改） 1审核通过")
     private Integer status;

eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java

@@ -128,7 +128,7 @@ public interface TbOrderInfoRepository extends JpaRepository<TbOrderInfo, Intege
                                                 @Param("currentPage") Integer currentPage, @Param("currentSize") Integer currentSize);
 
 
-    @Query(value = "SELECT ifnull( sum( order_amount ), 0 ) AS amount,trade_day as tradeDay " +
+    @Query(value = "SELECT ifnull( sum( order_amount ), 0 ) AS amount,trade_day as tradeDay ,ifnull( sum(discount_amount), 0 ) AS saveAmount " +
             "FROM tb_order_info WHERE shop_id = :shopId AND ((status = 'closed') OR ( status ='refund' AND order_type != 'return' ))" +
             "AND trade_day BETWEEN :startTime AND :endTime " +
             "GROUP BY shop_id,trade_day", nativeQuery = true)

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java

@@ -239,6 +239,7 @@ public class SummaryServiceImpl implements SummaryService {
             SumDateVO sumDateVO = new SumDateVO();
             sumDateVO.setAmount((BigDecimal) o[0]);
             sumDateVO.setTradeDay((String) o[1]);
+            sumDateVO.setSaveAmount((BigDecimal) o[2]);
             sumDateVOList.add(sumDateVO);
         }
         //填充日期
@@ -246,7 +247,8 @@ public class SummaryServiceImpl implements SummaryService {
         for (SumDateVO entry : sumDateVOList) {
             String tradeDay = entry.getTradeDay();
             BigDecimal amount = entry.getAmount();
-            dataMap.put(tradeDay, new SumDateVO(tradeDay, amount));
+            BigDecimal saveAmount = entry.getSaveAmount();
+            dataMap.put(tradeDay, new SumDateVO(tradeDay, amount, saveAmount));
         }
         // 获取今天的日期
         LocalDate today = LocalDate.now();
@@ -263,7 +265,7 @@ public class SummaryServiceImpl implements SummaryService {
                 sumDateVO = dataMap.get(tradeDayString);
             } else {
                 // 如果不存在，则创建新的SumDateVO对象，amount设为0
-                sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO);
+                sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO, BigDecimal.ZERO);
             }
             // 将SumDateVO对象添加到列表中
             sumDateList.add(sumDateVO);

eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java

@@ -13,6 +13,7 @@ import java.time.LocalDate;
 public class SumDateVO {
     private String tradeDay;
     private BigDecimal amount;
+    private BigDecimal saveAmount;
 
     public SumDateVO() {
 
@@ -34,8 +35,19 @@ public class SumDateVO {
         this.amount = amount;
     }
 
-    public SumDateVO(String tradeDay, BigDecimal amount) {
+
+    public BigDecimal getSaveAmount() {
+        return saveAmount;
+    }
+
+    public void setSaveAmount(BigDecimal saveAmount) {
+        this.saveAmount = saveAmount;
+    }
+
+
+    public SumDateVO(String tradeDay, BigDecimal amount, BigDecimal saveAmount) {
         this.tradeDay = tradeDay;
         this.amount = amount;
+        this.saveAmount = saveAmount;
     }
 }