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

pom.xml

@@ -481,6 +481,12 @@
             <version>0.4.8</version>
         </dependency>
 
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.4.01</version>
+        </dependency>
+
         <!--mapStruct依赖-->
         <dependency>
             <groupId>org.mapstruct</groupId>

src/main/java/com/ydtech/components/TokenInterceptor.java

@@ -76,6 +76,8 @@ public class TokenInterceptor {
         notMatchList.add("/order/boHaiApi/underwritingCallback");
         notMatchList.add("/order/boHaiApi/auditCallback");
         notMatchList.add("/order/boHaiApi/policyResultCallback");
+        // 支付宝登录
+        notMatchList.add("/alipay/login");
 
         return new SaInterceptor(handler -> {
             // 指定一条 match 规则

src/main/java/com/ydtech/modules/admin/service/impl/AlipayServiceImpl.java

@@ -41,10 +41,10 @@ public class AlipayServiceImpl implements AlipayService {
         AlipaySystemOauthTokenResponse response = alipayClient.execute(request);
         String aliPayId = response.getUserId();
         SysUser sysUser = sysUserService.lambdaQuery()
-                .eq(SysUser::getOpenid, aliPayId)
+                .eq(SysUser::getAlipay, aliPayId)
                 .one();
 
-        // 没有绑定微信
+        // 没有绑定支付宝
         if (sysUser == null) {
             throw new SystemException("您还未绑定工号");
         }

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesServiceImpl.java

@@ -205,6 +205,7 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
             wrapper.eq(InsPlyIncome::getId, item.getId());
             wrapper.set(InsPlyIncome::getHandlingFeesStatus, "0");
             wrapper.set(InsPlyIncome::getTaskId, null);
+            wrapper.set(InsPlyIncome::getSettlementUserId, null);
             insPlyIncomeMapper.update(item, wrapper);
         }
 

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -171,7 +171,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                                 StringRedisTemplate redisTemplate, @Lazy InsAreaCompanyService insAreaCompanyService,
                                 PtlAgreementService ptlAgreementService,
                                 @Lazy FeeRuleSchemeServiceImpl feeRuleSchemeService,
-                                InsFeeAuditService insFeeAuditService, InsOrdersTrackService insOrdersTrackService,
+                                @Lazy InsFeeAuditService insFeeAuditService, InsOrdersTrackService insOrdersTrackService,
                                 InsFileMapper insFileMapper) {
 
         this.orderComponents = orderComponents;

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -466,13 +466,16 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 //            }
 //        }
         for (int i = 0; i < agreementProductCosts.getProductId().size(); i++) {
-            // 外部订单的检测  每个产品只可有一个费用
-            List<PtlAgreementProductCostsNew> list = ptlAgreementProductCostsNewService.list(new LambdaQueryWrapper<PtlAgreementProductCostsNew>()
-                    .eq(PtlAgreementProductCostsNew::getProductId, agreementProductCosts.getProductId().get(i))
-                    .eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductCosts.getAgreementId())
-                    .eq(PtlAgreementProductCostsNew::getIsAudit, 1));
-            if (list.size() > 0) {
-                throw new SystemException(agreementProductCosts.getProductName().get(i) + "产品费用已存在,请勿重复添加!");
+            PtlAgreement ptlAgreement = ptlAgreementService.getById(agreementProductCosts.getAgreementId());
+            if(ptlAgreement.getIsExternal() == 1) {
+                // 外部订单的检测  每个产品只可有一个费用
+                List<PtlAgreementProductCostsNew> list = ptlAgreementProductCostsNewService.list(new LambdaQueryWrapper<PtlAgreementProductCostsNew>()
+                        .eq(PtlAgreementProductCostsNew::getProductId, agreementProductCosts.getProductId().get(i))
+                        .eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductCosts.getAgreementId())
+                        .eq(PtlAgreementProductCostsNew::getIsAudit, 1));
+                if (list.size() > 0) {
+                    throw new SystemException(agreementProductCosts.getProductName().get(i) + "产品费用已存在,请勿重复添加!");
+                }
             }
             PtlAgreementProductCostsNew ptlAgreementProductCostsNew = new PtlAgreementProductCostsNew();
             BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNew);

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1260,6 +1260,9 @@
         <if test="param != null and param != ''">
             AND (a.licenseno = #{param} or a.ins_company = #{param})
         </if>
+        <if test="userId != null and userId != ''">
+            AND a.userid = #{userId}
+        </if>
 
     </select>