Merge remote-tracking branch 'origin/master'

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/meterreadingmgt/entity/BwMeterReadPlan.java

@@ -51,7 +51,7 @@ public class BwMeterReadPlan extends Model<BwMeterReadPlan> {
     /**
      * 抄表卡ID：TF_YWYS_DA_METER.METER_CARD_ID=TF_YWYS_BW_METER_READ_PLAN.METER_CARD_ID
      */
-    @TableId(value = "CUSTOMER_NO", type = IdType.INPUT)
+    @TableId(value = "METER_CARD_ID", type = IdType.INPUT)
     @ApiModelProperty(value = "抄表卡ID")
     private String meterCardId;
     /**

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/controller/DaCustomerController.java

@@ -601,7 +601,8 @@ public class DaCustomerController {
             daCustomer.setCustomerState(daCustomerAndMeter.getDaCustomer().getCustomerState());
             daMeter.setMeterCardId(daCustomerAndMeter.getDaMeter().getMeterCardId());
             daMeter.setCustomerNo(daCustomerAndMeter.getDaCustomer().getCustomerNo());
-            bwMeterReadPlan.setCustomerNo(daCustomerAndMeter.getDaCustomer().getCustomerNo());
+            //bwMeterReadPlan.setCustomerNo(daCustomerAndMeter.getDaCustomer().getCustomerNo());
+            bwMeterReadPlan.setMeterCardId(daCustomerAndMeter.getDaMeter().getMeterCardId().toString());
             bwMeterReadPlan.setCalState("1");
             // bwMeterReadPlan.setAuditFlag();
             if (daCustomerAndMeter.getDaCustomer().getCustomerState().equals("4")) {

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/controller/DaGhLogController.java

@@ -147,7 +147,7 @@ public class DaGhLogController {
                 DaCustomer daCustomer = new DaCustomer();
                 daCustomer.setCustomerNo(daGhLog.getCustomerNo());//用户编号
                 daCustomer.setCustomerName(daGhLog.getNewCustomerName());//姓名
-                daCustomer.setCustomerPhone(daGhLog.getOldPhone());//电话
+                daCustomer.setCustomerPhone(daGhLog.getNewCustomerPhone());//电话
                 if (StringUtil.isNotBlank(daGhLog.getNewCustomerAddr())) {
                     daCustomer.setCustomerAddress(daGhLog.getNewCustomerAddr());//地址
                 }