feature 代码提交

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwBillingRecordServiceImpl.java

@@ -384,7 +384,7 @@ public class SwBillingRecordServiceImpl extends ServiceImpl<SwBillingRecordDao,
         int randomNumber = random.nextInt(1000);
         String randomStr = String.format("%03d", randomNumber);
         LocalDateTime now = LocalDateTime.now();
-        add.setBillingnumber(now.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + randomStr);
+        add.setBillingnumber(now.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")) + randomStr);
 
     }
 

zhsw-entity/src/main/java/com/rongwe/zhsw/system/domain/SwBillManagementPaidDo.java

@@ -157,6 +157,9 @@ public class SwBillManagementPaidDo extends BaseDo implements Serializable {
      * 缴费记录ID
      */
     private String waterusageid;
-
+    /**
+     * 商户支付订单号
+     */
+    private String merchantpaymentnumber;
 }
 

zhsw-entity/src/main/java/com/rongwe/zhsw/system/domain/SwBillManagementUnpaidDo.java

@@ -162,6 +162,9 @@ public class SwBillManagementUnpaidDo extends BaseDo implements Serializable {
      * 缴费记录ID
      */
     private String waterusageid;
-
+    /**
+     * 商户支付订单号
+     */
+    private String merchantpaymentnumber;
 }