付款管理-复核时根据服务商查询当月累计已打款

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/entity/HlgPaymentDetail.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -156,4 +157,10 @@ public class HlgPaymentDetail implements Serializable {
     private java.lang.Integer taxType;
 
     private Double taxFee;  //税费
+
+    /**
+     * 服务商id
+     */
+    @TableField(exist = false)
+    private java.lang.Integer subcontractorId;
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/mapper/xml/HlgPaymentDetailMapper.xml

@@ -246,11 +246,13 @@
 		<include refid="hlgPaymentDetailColumns"/>
 		FROM hlg_payment_detail a
 		<include refid="hlgPaymentDetailJoins"/>
+		LEFT JOIN hlg_payment p ON p.id = a.payment_id
 		<where>
 			a.idcard_number = #{hlgPaymentDetail.idcardNumber}
 			and DATE_FORMAT(a.payment_time, '%Y%m') = DATE_FORMAT( CURDATE( ) , '%Y%m' )
 			and (a.status = 1 or a.status = 2)
 			and a.del_flag = '0'
+			and p.subcontractor_id = #{hlgPaymentDetail.subcontractorId}
 		</where>
 	</select>
 

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/service/impl/HlgPaymentServiceImpl.java

@@ -274,6 +274,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
                 /**
                  * 计算个人所得税
                  */
+                hlgPaymentDetail.setSubcontractorId(hlgPayment.getSubcontractorId());
                 //1.该付款明细用户本月累计已打款(包含：1：付款中 2：付款成功)
                 List<HlgPaymentDetail> userList = hlgPaymentDetailService.findMonthListByUserId(hlgPaymentDetail);
                 //已付总额
@@ -554,6 +555,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
             /**
              * 计算个人所得税
              */
+            hlgPaymentDetail.setSubcontractorId(hlgPayment.getSubcontractorId());
             //1.该付款明细用户本月累计已打款(包含：1：付款中 2：付款成功)
             List<HlgPaymentDetail> userList = hlgPaymentDetailService.findMonthListByUserId(hlgPaymentDetail);
             //已付总额
@@ -990,6 +992,7 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
             /**
              * 计算个人所得税
              */
+            hlgPaymentDetail.setSubcontractorId(hlgPayment.getSubcontractorId());
             //1.该付款明细用户本月累计已打款(包含：1：付款中 2：付款成功)
             List<HlgPaymentDetail> userList = hlgPaymentDetailService.findMonthListByUserId(hlgPaymentDetail);
             //已付总额