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

report-service/src/main/java/com/ssy/lingxi/report/dao/aftersale/ReturnGoodsDAO.java

@@ -104,7 +104,7 @@ public class ReturnGoodsDAO {
                 .append(" where refund.outer_status=4")  // 确认到账
                 .append(" and refund.pay_rule_id=1")    // 平台代收
                 .append(" and re.refund_amount>0")
-                .append(" and refund.refund_time between " + startTime + " and " + endTime)
+                .append(" and refund.confirm_time between " + startTime + " and " + endTime)
                 .append(" and re.parent_member_id=" + memberId + " and re.parent_member_role_id=" + roleId);
 
         List<PlatformSettlementBO> resultList = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(PlatformSettlementBO.class));
@@ -136,7 +136,7 @@ public class ReturnGoodsDAO {
                 .append(" where refund.outer_status=4")  // 确认到账
                 .append(" and refund.pay_rule_id=1")    // 平台代收
                 .append(" and re.refund_amount>0")
-                .append(" and refund.refund_time between " + startTime + " and " + endTime)
+                .append(" and refund.confirm_time between " + startTime + " and " + endTime)
                 .append(" and re.parent_member_id=" + memberId + " and re.parent_member_role_id=" + roleId);
 
         return jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(PlatformSettlementDetailDO.class));

report-service/src/main/java/com/ssy/lingxi/report/dao/order/ProcurementOrderDAO.java

@@ -289,7 +289,7 @@ public class ProcurementOrderDAO {
                 .append("   where pay.fund_mode=1 ") //平台代收
                 .append("   and pay.outer_status=100") //确认到账
                 .append("   and pay.pay_rate>0") //支付比例大于0
-                .append("   and pay.pay_time between \'" + DateUtil.formatDateTime(new Date(startTime)) + "\' and \'" + DateUtil.formatDateTime(new Date(endTime))+"\'") //支付创建时间
+                .append("   and pay.confirm_time between \'" + DateUtil.formatDateTime(new Date(startTime)) + "\' and \'" + DateUtil.formatDateTime(new Date(endTime))+"\'") //支付创建时间
                 .append("   and ord.order_type in(1,2,3,4,5,6)")   //订单类型为非积分订单
                 .append("   and ord.vendor_member_id=" + memberId + " and ord.vendor_role_id=" + roleId)
                 .append(" )t")
@@ -334,7 +334,7 @@ public class ProcurementOrderDAO {
                 .append("   where pay.fund_mode=1 ") //平台代收
                 .append("   and pay.outer_status=100") //确认到账
                 .append("   and pay.pay_rate>0") //支付比例大于0
-                .append("   and pay.pay_time between \'" + DateUtil.formatDateTime(new Date(startTime)) + "\' and \'" + DateUtil.formatDateTime(new Date(endTime)) + "\'") //支付创建时间
+                .append("   and pay.confirm_time between \'" + DateUtil.formatDateTime(new Date(startTime)) + "\' and \'" + DateUtil.formatDateTime(new Date(endTime)) + "\'") //支付创建时间
                 .append("   and ord.order_type in(1,2,3,4,5,6)")   //订单类型为非积分订单
                 .append("   and ord.vendor_member_id=" + memberId + " and ord.vendor_role_id=" + roleId)
                 .append(" )t")

report-service/src/main/java/com/ssy/lingxi/report/serviceimpl/MemberSettlementServiceImpl.java

@@ -1045,7 +1045,7 @@ public class MemberSettlementServiceImpl implements IMemberSettlementService {
         // 获取最后一次订单结算
         MemberOrderSettlementDO memberProductionNoticeSettlementDO = memberOrderSettlementRepository.findFirstByMemberIdAndRoleIdAndPayMemberIdAndPayRoleIdOrderByPayTimeDesc(memberId, roleId, payMemberId, payRoleId);
         //在原有时间上加1，防止后续查询数据重复
-        Long startTime = (memberProductionNoticeSettlementDO != null ? (memberProductionNoticeSettlementDO.getPayTime() + 1) : 0);
+        Long startTime = (memberProductionNoticeSettlementDO != null ? (memberProductionNoticeSettlementDO.getPayTime() + 1000) : 0);
 
         // 设置结算时间范围,预付款时间
         memberSettlementDO.setPrePayTime(settlementDate);