薪资单-1.其他加扣款中的银盾在线佣金增加withdrawId出参 2.薪资单列表查询接口时间格式

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -480,6 +480,8 @@ public class PractitionerController {
 
     /**
      * 薪资单明细保单列表查询接口
+     * 此接口根据/querySalaryDetail接口返回报文中的年份和月份查询，查询时需要将月份往后推2个月
+     *
      * @param requestVO 请求信息
      * @return PolicyInfoQueryResponseVO
      */

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -23,6 +23,7 @@ import com.yd.api.result.CommonResult;
 import com.yd.dal.entity.agms.fortune.FortunePayToOrderInfo;
 import com.yd.dal.entity.agms.fortune.WithdrawLabelInfo;
 import com.yd.dal.entity.agms.fortune.WithdrawQueryInfo;
+import com.yd.dal.entity.customer.AclCustomerFortune;
 import com.yd.dal.entity.customer.AclFileUpload;
 import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
@@ -36,6 +37,7 @@ import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
 import com.yd.dal.entity.product.Product;
 import com.yd.dal.entity.product.ProductE;
 import com.yd.dal.entity.product.ProductPlan;
+import com.yd.dal.mapper.customer.AclCustomerFortuneMapper;
 import com.yd.dal.mapper.practitioner.AgAclLifePractitionerSalaryMapper;
 import com.yd.dal.mapper.customer.AclPractitionerMapper;
 import com.yd.dal.service.agms.AgmsFortuneDALService;
@@ -111,7 +113,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     @Autowired
     private N22SalaryService n22SalaryService;
     @Autowired
-    private AclPractitionerMapper practitionerMapper;
+    private AclCustomerFortuneMapper aclCustomerFortuneMapper;
     @Autowired
     private AgmsFortuneDALService agmsFortuneDalService;
 
@@ -549,6 +551,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
 
     private void translateObj(List<AgAclLifePractitionerSalary> list, List<PayScaleInfo> resultList) {
         PayScaleInfo payScaleInfo;
+        String time;
         for (AgAclLifePractitionerSalary salary : list) {
             payScaleInfo = new PayScaleInfo();
             payScaleInfo.setMonShId(salary.getId());
@@ -557,6 +560,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue());
             payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
 
+            if (StringUtils.isNotBlank(payScaleInfo.getMonDtlPeriod())) {
+                time = payScaleInfo.getMonDtlPeriod();
+                payScaleInfo.setYears(time.substring(0, 4));
+                payScaleInfo.setMonth(time.substring(-2));
+            }
+
             resultList.add(payScaleInfo);
         }
     }
@@ -662,7 +671,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         this.handleDateParams(salaryDetailsSearchRequestBody, requestVO);
         salaryDetailsSearchRequestBody.setLoginName(requestVO.getAgent_id());
         salaryDetailsSearchRequestBody.setSearchType("1");
-        salaryDetailsSearchRequestBody.setPaid_Status("3");
+        salaryDetailsSearchRequestBody.setPaid_Status("");
         salaryDetailsSearchRequestBody.setCheckStatus("1");
 
         SalaryDetailsSearchResponseVO salaryDetailsSearchResponseVO = n22SalaryService.salaryDetailsSearch(salaryDetailsSearchRequestBody);
@@ -727,19 +736,25 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
 
             //查询所有订单,并根据支付id标记本次提现订单
             List<FortunePayToOrderInfo> fortunePayToOrderInfos = agmsFortuneDalService.fortunePayToOrder(new Long[]{payId});
-            List<OtherCommission> otherCommissionList = this.createOtherCommissionList(fortunePayToOrderInfos);
+            List<OtherCommission> otherCommissionList = this.createOtherCommissionList(fortunePayToOrderInfos, payId);
 
             responseBody.setOtherCommissionList(otherCommissionList);
         }
 
     }
 
-    private List<OtherCommission> createOtherCommissionList(List<FortunePayToOrderInfo> fortunePayToOrderInfos) {
+    private List<OtherCommission> createOtherCommissionList(List<FortunePayToOrderInfo> fortunePayToOrderInfos, Long  payId) {
+        //获取withdrewId
+        AclCustomerFortune fortune = aclCustomerFortuneMapper.queryByPayId(payId);
+
         List<OtherCommission> list = new ArrayList<>();
         for (FortunePayToOrderInfo orderInfo : fortunePayToOrderInfos) {
             OtherCommission otherCommission = new OtherCommission();
             otherCommission.setCommissionName("银盾在线佣金");
             otherCommission.setCommission(String.valueOf(orderInfo.getReferralAmount()));
+            if (fortune != null) {
+                otherCommission.setWithdrawedId(fortune.getWithdrawedId());
+            }
 
             list.add(otherCommission);
         }

yd-api/src/main/java/com/yd/dal/mapper/customer/AclCustomerFortuneMapper.java

@@ -35,4 +35,6 @@ public interface AclCustomerFortuneMapper {
     List<AclCustomerFortune> findByOrderId(Long orderId);
 
     List<AclCustomerFortuneStatistics> findBypractitionerIds(@Param("list")List<Long> practitionerIds, @Param("time")Integer time);
+
+    AclCustomerFortune queryByPayId(Long payId);
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/OtherCommission.java

@@ -7,6 +7,7 @@ public class OtherCommission {
     private String CommissionName;//奖金名称
     private String Commission; //奖金金额
     private String Comments;//备注
+    private Long withdrawedId;
 
     public OtherCommission() {
     }
@@ -34,4 +35,12 @@ public class OtherCommission {
     public void setComments(String comments) {
         Comments = comments;
     }
+
+    public Long getWithdrawedId() {
+        return withdrawedId;
+    }
+
+    public void setWithdrawedId(Long withdrawedId) {
+        this.withdrawedId = withdrawedId;
+    }
 }

yd-api/src/main/resources/mapper/customer/AclCustomerFortuneMapper.xml

@@ -938,4 +938,10 @@
       GROUP BY f.customer_id
     </select>
 
+  <select id="queryByPayId" parameterType="java.lang.Long" resultMap="BaseResultMap">
+      select <include refid="Base_Column_List" />
+      from  ag_acl_customer_fortune t
+      where t.fortune_payed_id = #{payId}
+  </select>
+
 </mapper>
\ No newline at end of file