薪资单-打开银盾在线明细，报错

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

@@ -20,10 +20,8 @@ import com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailRequestVO;
 import com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailResponseVO;
 import com.yd.api.practitioner.vo.subordinate.TeamMemberDetail;
 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;
@@ -37,9 +35,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;
 import com.yd.dal.service.customer.AclFileUploadDALService;
 import com.yd.dal.service.customer.AclPractitionerDALService;
@@ -113,8 +109,6 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     @Autowired
     private N22SalaryService n22SalaryService;
     @Autowired
-    private AclCustomerFortuneMapper aclCustomerFortuneMapper;
-    @Autowired
     private AgmsFortuneDALService agmsFortuneDalService;
 
     @Override
@@ -469,7 +463,9 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 payScaleInfo.setMonDtlPeriod(key);
                 payScaleInfo.setLoginName(loginName);
                 // 处理时间,作为接口/searchStaffSalaryDetails的查询入参
-                this.handleYearsAndMonth(years, month, payScaleInfo);
+                if (StringUtils.isNotBlank(years) && StringUtils.isNotBlank(month)) {
+                    this.handleYearsAndMonth(years, month, payScaleInfo);
+                }
 
                 resultList.add(payScaleInfo);
             }
@@ -482,12 +478,6 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     }
 
     private void handleYearsAndMonth(String years, String month, PayScaleInfo payScaleInfo) {
-
-        System.out.println("看看报错二");
-        System.out.println(years);
-        System.out.println(month);
-        System.out.println(payScaleInfo);
-
         Integer mon = Integer.valueOf(month);
         Integer year = Integer.valueOf(years);
         if (mon == 11) {
@@ -704,7 +694,13 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
 
     @Override
     public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) {
-        // 1.查询佣金和税的接口
+        QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();
+        // 1.检查请求参数
+        if (StringUtils.isBlank(requestVO.getYears())||StringUtils.isBlank(requestVO.getMonth())) {
+            responseVO.setCommonResult(new CommonResult(false, "查询年月不能为空"));
+            return responseVO;
+        }
+        // 2.查询佣金和税的接口
         SalaryDetailsSearchRequestBody salaryDetailsSearchRequestBody = new SalaryDetailsSearchRequestBody();
         this.handleDateParams(salaryDetailsSearchRequestBody, requestVO);
         salaryDetailsSearchRequestBody.setLoginName(requestVO.getAgent_id());
@@ -714,9 +710,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
 
         SalaryDetailsSearchResponseVO salaryDetailsSearchResponseVO = n22SalaryService.salaryDetailsSearch(salaryDetailsSearchRequestBody);
 
-        // 2.组装前端数据
-        QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();
-
+        // 3.组装前端数据
         if ("查询成功".equals(salaryDetailsSearchResponseVO.getResponseHead().getMessage())) {
 
             SalaryDetailsSearchResponseBody salaryDetails = salaryDetailsSearchResponseVO.getResponseBody();
@@ -758,7 +752,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     public SearchStaffSalaryDetailsResponseBody searchStaffSalaryDetails(SearchStaffSalaryDetailsRequestBody requestVO) {
 
         SearchStaffSalaryDetailsResponseBody responseBody = new SearchStaffSalaryDetailsResponseBody();
-
+        // 检查请求参数
+        if (StringUtils.isBlank(requestVO.getYears())||StringUtils.isBlank(requestVO.getMonth())) {
+            responseBody.setCommonResult(new CommonResult(false, "查询年月不能为空"));
+            return responseBody;
+        }
+        // 调接口
         SearchStaffSalaryDetailsResponseVO searchStaffSalaryDetailsResponseVO = n22SalaryService.searchStaffSalaryDetails(requestVO);
         if ("查询成功".equals(searchStaffSalaryDetailsResponseVO.getResponseHead().getMessage())) {
             responseBody = searchStaffSalaryDetailsResponseVO.getResponseBody();
@@ -781,18 +780,14 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
 
         // 有银盾在线佣金
         if (CollectionUtils.isNotEmpty(withdraws)) {
-            Long  payId = withdraws.get(0).getPayId();
-
-            //查询所有订单,并根据支付id标记本次提现订单
-            List<FortunePayToOrderInfo> fortunePayToOrderInfos = agmsFortuneDalService.fortunePayToOrder(new Long[]{payId});
+            Long  withdrawId = withdraws.get(0).getWithdrawId();
 
             List<OtherCommission> otherCommissionList = responseBody.getOtherCommissionList();
             for (OtherCommission otherCommission : otherCommissionList) {
                 // 此项为银盾在线佣金
                 if ("12C24EDF-83D7-081C-AE2C-085031C4DCAF".equals(otherCommission.getProject_Id())) {
                     //获取withdrewId
-                    AclCustomerFortune fortune = aclCustomerFortuneMapper.queryByPayId(payId);
-                    otherCommission.setWithdrawedId(fortune.getWithdrawedId());
+                    otherCommission.setWithdrawedId(withdrawId);
                 }
 
             }

yd-api/src/main/java/com/yd/dal/entity/agms/fortune/WithdrawLabelInfo.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 public class WithdrawLabelInfo {
 
     private Long payId;
+
+    private Long withdrawId;
     /**
      * 预计发佣年月
      */

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

@@ -36,5 +36,4 @@ public interface AclCustomerFortuneMapper {
 
     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/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -137,6 +137,7 @@
 
     <resultMap id="WithdrawLabelInfo" type="com.yd.dal.entity.agms.fortune.WithdrawLabelInfo">
         <id column="payId" jdbcType="BIGINT" property="payId" />
+        <result column="withdrawId" jdbcType="BIGINT" property="withdrawId" />
         <result column="payoutYearmonth" jdbcType="VARCHAR" property="payoutYearmonth" />
         <result column="practitionerName" jdbcType="VARCHAR" property="practitionerName" />
         <result column="referralAmount" jdbcType="DECIMAL" property="referralAmount" />
@@ -152,6 +153,7 @@
             parameterType="com.yd.dal.entity.agms.fortune.WithdrawQueryInfo"
             resultMap="WithdrawLabelInfo">
         select distinct pay.id                       payId,
+        pay.withdraw_id              withdrawId,
         pb.payout_yearmonth          payoutYearmonth,
         pra.name                     practitionerName,
         pay.withdraw_amount          referralAmount,

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

@@ -938,10 +938,4 @@
       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