Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PaymentManagement.java

@@ -79,6 +79,22 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 身份证号码
      */
     private String customerNumberCard;
+    /**
+     * 银行卡附件地址
+     */
+    private String payeeAddressUrl;
+    /**
+     * 银行卡账号
+     */
+    private String bankCard;
+    /**
+     * 开户行
+     */
+    private String bankDeposit;
+    /**
+     * 开户支行
+     */
+    private String bankDepositBranch;
     /**
      * 车牌号
      */
@@ -481,21 +497,21 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      */
     @TableField(exist = false)
     private String skinInspector;
-    /**
-     * 银行卡账号
-     */
-    @TableField(exist = false)
-    private String bankCard;
-    /**
-     * 开户行
-     */
-    @TableField(exist = false)
-    private String bankDeposit;
-    /**
-     * 开户支行
-     */
-    @TableField(exist = false)
-    private String bankDepositBranch;
+//    /**
+//     * 银行卡账号
+//     */
+//    @TableField(exist = false)
+//    private String bankCard;
+//    /**
+//     * 开户行
+//     */
+//    @TableField(exist = false)
+//    private String bankDeposit;
+//    /**
+//     * 开户支行
+//     */
+//    @TableField(exist = false)
+//    private String bankDepositBranch;
     /**
      * app端传1
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeighingManagement.java

@@ -383,6 +383,31 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private String tranCarNo;
+    /**
+     * 银行卡附件地址
+     */
+    @TableField(exist = false)
+    private String payeeAddressUrl;
+    /**
+     * 银行卡账号
+     */
+    @TableField(exist = false)
+    private String bankCard;
+    /**
+     * 开户行
+     */
+    @TableField(exist = false)
+    private String bankDeposit;
+    /**
+     * 开户支行
+     */
+    @TableField(exist = false)
+    private String bankDepositBranch;
+    /**
+     * identityId
+     */
+    @TableField(exist = false)
+    private String identityId;
     /**
      *仓库对象
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -61,6 +61,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     @Autowired
     private IWarehousePositionStorageInfoService warehousePositionStorageInfoService;
     @Autowired
+    private  IIdentityAuthenticationInfoService identityAuthenticationInfoService;
+    @Autowired
     private IWarehouseBaseInfoService warehouseBaseInfoService;
     @Autowired
     private IWarehousePositionInfoService warehousePositionInfoService;
@@ -3325,6 +3327,19 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 paymentManagement1.setGrossWeight(weighingManagement1.getGrossWeight());
                                 paymentManagement1.setTare(weighingManagement.getTare());
                                 paymentManagement1.setWarehouseName(weighingManagement1.getWarehouseName());
+                                //获取银行卡等相关信息
+                                IdentityAuthenticationInfo identityAuthenticationInfo = identityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
+                                        .eq("comp_id", weighingManagement1.getCompId())
+                                        .eq("customer_name",weighingManagement1.getCustomer())
+                                        .eq("customer_phone",weighingManagement1.getCustomerPhone())
+                                        .eq("delete_flag","0"));
+                                if(identityAuthenticationInfo != null){
+                                    paymentManagement1.setBankCard(identityAuthenticationInfo.getBankCard());
+                                    paymentManagement1.setBankDeposit(identityAuthenticationInfo.getBankDeposit());
+                                    paymentManagement1.setBankDepositBranch(identityAuthenticationInfo.getBankDepositBranch());
+                                    paymentManagement1.setPayeeAddressUrl(identityAuthenticationInfo.getPayeeAddressUrl());
+                                    paymentManagement1.setIdentityId(identityAuthenticationInfo.getId());
+                                }
                                 //质检信息
                                 QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                                         .eq("relation_id", weighingManagement1.getRelationId())

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -51,6 +51,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
     @Autowired
     private IQualityInspectionManagementService qualityInspectionManagementService;
     @Autowired
+    private  IIdentityAuthenticationInfoService identityAuthenticationInfoService;
+    @Autowired
     private ICommonCompanyService commonCompanyService;
     @Autowired
     private IWarehouseBaseInfoService warehouseBaseInfoService;
@@ -332,6 +334,20 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 paymentManagement1.setGrossWeight(weighingManagement1.getGrossWeight());
                 paymentManagement1.setTare(weighingManagement.getTare());
                 paymentManagement1.setWarehouseName(weighingManagement1.getWarehouseName());
+                //获取银行卡等相关信息
+                IdentityAuthenticationInfo identityAuthenticationInfo = identityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
+                        .eq("comp_id", weighingManagement1.getCompId())
+                        .eq("customer_name",weighingManagement1.getCustomer())
+                        .eq("customer_phone",weighingManagement1.getCustomerPhone())
+                        .eq("delete_flag","0"));
+                if(identityAuthenticationInfo != null){
+                    paymentManagement1.setBankCard(identityAuthenticationInfo.getBankCard());
+                    paymentManagement1.setBankDeposit(identityAuthenticationInfo.getBankDeposit());
+                    paymentManagement1.setBankDepositBranch(identityAuthenticationInfo.getBankDepositBranch());
+                    paymentManagement1.setPayeeAddressUrl(identityAuthenticationInfo.getPayeeAddressUrl());
+                    paymentManagement1.setIdentityId(identityAuthenticationInfo.getId());
+                }
+
                 //质检信息
                 QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                         .eq("relation_id", weighingManagement1.getRelationId())

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -131,6 +131,10 @@
         a.customer_name as customerName,
         a.customer_number_card as customerNumberCard,
         a.customer_phone as customerPhone,
+        a.payee_address_url as payeeAddressUrl,
+        a.bank_card as bankCard,
+        a.bank_deposit as bankDeposit,
+        a.bank_deposit_branch as bankDepositBranch,
         a.collection_date as collectionDate,
         a.status,
         a.picture_address as pictureAddress,