更新

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

@@ -79,18 +79,10 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 身份证号码
      */
     private String customerNumberCard;
-    /**
-     * 地址
-     */
-    private String compAddress;
     /**
      * 车牌号
      */
     private String carNo;
-    /**
-     * 等级
-     */
-    private String grade;
     /**
      * 货名
      */
@@ -366,6 +358,11 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
     @TableField(exist = false)
     private Date endDate;
 
+    /**
+     * 等级
+     */
+    @TableField(exist = false)
+    private String grade;
     /**
      * 银行信息
      */

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

@@ -112,15 +112,16 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         if ("1".equals(identityAuthenticationInfo2.getCover())) {
             identityAuthenticationInfo2.setCover("0");
         }
-//        IdentityAuthenticationInfo identityAuthenticationInfo1 = this.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
-//                .eq("customer_phone", identityAuthenticationInfo.getCustomerPhone())
-//                .eq("customer_type_flag", identityAuthenticationInfo2.getCustomerTypeFlag())
-//                .eq("delete_flag", "0"));
-//        //查询手机号存在，将其覆盖
-//        if (identityAuthenticationInfo1 != null) {
-//            identityAuthenticationInfo1.setCover("1");
-//            this.updateById(identityAuthenticationInfo1);
-//        }
+        IdentityAuthenticationInfo identityAuthenticationInfo1 = this.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
+                .eq("customer_phone", identityAuthenticationInfo.getCustomerPhone())
+                .eq("customer_type_flag", identityAuthenticationInfo2.getCustomerTypeFlag())
+                .eq("delete_flag", "0"));
+        //查询手机号存在，将其覆盖
+        if (identityAuthenticationInfo1 != null) {
+            identityAuthenticationInfo1.setCover("1");
+            identityAuthenticationInfo1.setDeleteFlag("1");
+            this.updateById(identityAuthenticationInfo1);
+        }
         identityAuthenticationInfo2.setCustomerPhone(identityAuthenticationInfo.getCustomerPhone());
         //修改身份认证信息
         this.updateById(identityAuthenticationInfo2);
@@ -159,12 +160,13 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                         .eq("customer_type_flag", identityAuthenticationInfo.getCustomerTypeFlag())
                         .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         //同一手机号再次被认证
-//        if (identityAuthenticationInfoList.size() > 0) {
-//            for (IdentityAuthenticationInfo identityAuthenticationInfo1 : identityAuthenticationInfoList) {
-//                identityAuthenticationInfo1.setCover("1");
-//                this.updateById(identityAuthenticationInfo1);
-//            }
-//        }
+        if (identityAuthenticationInfoList.size() > 0) {
+            for (IdentityAuthenticationInfo identityAuthenticationInfo1 : identityAuthenticationInfoList) {
+                identityAuthenticationInfo1.setCover("1");
+                identityAuthenticationInfo1.setDeleteFlag("1");
+                this.updateById(identityAuthenticationInfo1);
+            }
+        }
         // 操作主表数据
         this.insert(identityAuthenticationInfo);
         //如果是个人粮商且公司id不为空，则添加公司与个人粮商关系表

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

@@ -1110,14 +1110,15 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getCarNo()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(12);
-                if("潮粮".equals(paymentManagement1.getType())){
-                    cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
-
-                }
-                else{
-                    cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
-
-                }
+//                if("潮粮".equals(paymentManagement1.getType())){
+//                    cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
+//
+//                }
+//                else{
+//                    cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
+//
+//                }
+                cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(13);
                 cell.setCellValue(editFloat(paymentManagement1.getGrossWeight()));

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

@@ -124,7 +124,9 @@
         c.comp_name as compName,
         c.comp_imo as taxRegistrationNo,
         i.id as identityId,
-        q.grade
+        q.grade,
+        a.grain_money as grainMoney,
+        a.actual_payment as actualPayment
         FROM payment_management a
         left join quality_inspection_management q on q.relation_id = a.relation_id and q.comp_id = a.comp_id and q.delete_flag = 0
         left join weighing_management w on w.relation_id = a.relation_id and w.comp_id = a.comp_id and w.delete_flag = 0