Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop i…

…nto feature/pg
e-kiss-me · Apr 21, 2022 · d46863b · d46863b
2 parents f0d6938 + 1917aa1
commit d46863b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java
@@ -35,11 +35,11 @@ public interface BillMapper extends BaseMapper<Bill> {
      * @param queryWrapper 查询条件
      * @return 结算单
      */
-    @Select("SELECT SUM( final_price ) AS orderPrice,SUM( commission_price ) AS commissionPrice" +
-            ",SUM( distribution_rebate ) AS distributionCommission,SUM( site_coupon_commission ) AS siteCouponCommission" +
-            ",SUM( point_settlement_price ) AS pointSettlementPrice " +
-            ",SUM( kanjia_settlement_price ) AS kanjiaSettlementPrice " +
-            ",SUM( bill_price ) AS billPrice " +
+    @Select("SELECT IFNULL(SUM( final_price ),0) AS orderPrice,IFNULL(SUM( commission_price ),0) AS commissionPrice" +
+            ",IFNULL(SUM( distribution_rebate ),0) AS distributionCommission,IFNULL(SUM( site_coupon_commission ),0) AS siteCouponCommission" +
+            ",IFNULL(SUM( point_settlement_price ),0) AS pointSettlementPrice " +
+            ",IFNULL(SUM( kanjia_settlement_price ),0) AS kanjiaSettlementPrice " +
+            ",IFNULL(SUM( bill_price ),0) AS billPrice " +
             "FROM li_store_flow ${ew.customSqlSegment}")
     Bill getOrderBill(@Param(Constants.WRAPPER) QueryWrapper<Bill> queryWrapper);
 
@@ -49,8 +49,8 @@ public interface BillMapper extends BaseMapper<Bill> {
      * @param queryWrapper 查询条件
      * @return 结算单
      */
-    @Select("SELECT SUM( final_price ) AS refundPrice,SUM( commission_price ) AS refundCommissionPrice" +
-            ",SUM( distribution_rebate ) AS distributionRefundCommission,SUM( site_coupon_commission ) AS siteCouponRefundCommission" +
-            ",SUM( final_price ) AS billPrice FROM li_store_flow ${ew.customSqlSegment}")
+    @Select("SELECT IFNULL(SUM( final_price ),0) AS refundPrice,IFNULL(SUM( commission_price ),0) AS refundCommissionPrice" +
+            ",IFNULL(SUM( distribution_rebate ),0) AS distributionRefundCommission,IFNULL(SUM( site_coupon_commission ),0) AS siteCouponRefundCommission" +
+            ",IFNULL(SUM( final_price ),0) AS billPrice FROM li_store_flow ${ew.customSqlSegment}")
     Bill getRefundBill(@Param(Constants.WRAPPER) QueryWrapper<Bill> queryWrapper);
 }
diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java
@@ -69,7 +69,8 @@ public interface StoreDetailMapper extends BaseMapper<StoreDetail> {
     @Select("SELECT store_id,settlement_day FROM li_store_detail " +
             "WHERE settlement_cycle LIKE concat(#{day},',%')  " +
             "OR settlement_cycle LIKE concat('%,',#{day},',%') " +
-            "OR settlement_cycle LIKE concat('%,',#{day})")
+            "OR settlement_cycle LIKE concat('%,',#{day})"+
+            "OR settlement_cycle = #{day}")
     List<StoreSettlementDay> getSettlementStore(int day);
 
     /**

diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
@@ -103,7 +103,7 @@ public void createBill(String storeId, Date startTime, DateTime endTime) {
             //分销订单退还，返现佣金返还
             bill.setDistributionRefundCommission(refundBill.getDistributionRefundCommission());
             //退货平台优惠券补贴返还
-            bill.setSiteCouponRefundCommission(refundBill.getSiteCouponRefundCommission()!=null?refundBill.getSiteCouponRefundCommission():0D);
+            bill.setSiteCouponRefundCommission(refundBill.getSiteCouponRefundCommission());
             //退款金额=店铺最终退款结算金额
             refundPrice = refundBill.getBillPrice();
         }