优化商城代码

java110-bean/src/main/java/com/java110/dto/fee/FeeAttrDto.java

@@ -35,6 +35,8 @@ public class FeeAttrDto extends PageDto implements Serializable {
     public static final String SPEC_CD_RATE = "390015";//递增率
     public static final String SPEC_CD_RATE_START_TIME = "390016";//递增开始时间
 
+    public static final String SPEC_CD_METER_ADDRESS = "390017";
+
     /**
      * INSERT INTO `tt`.`t_dict` ( `status_cd`, `name`, `description`, `create_time`, `table_name`, `table_columns`)
      * VALUES ( '390014', '递增周期', '递增周期', '2020-01-30 17:09:43', 'pay_fee_attrs', 'spec_cd');

service-acct/src/main/java/com/java110/acct/payment/business/meter/PreStoreMeterPaymentBusiness.java

@@ -40,7 +40,7 @@ import java.util.Calendar;
 import java.util.List;
 
 /**
- * 欠费缴费
+ * 水电充值
  */
 @Service("preStoreMeter")
 public class PreStoreMeterPaymentBusiness implements IPaymentBusiness {
@@ -101,6 +101,7 @@ public class PreStoreMeterPaymentBusiness implements IPaymentBusiness {
         Assert.listOnlyOne(machines, "表不存在");
 
         String typeCd = machines.getJSONObject(0).getString("typeCd");
+        String address = machines.getJSONObject(0).getString("address");
         String typeCdName = "";
         if (FeeConfigDto.FEE_TYPE_CD_WATER.equals(typeCd)) {
             typeCdName = "水费充值";
@@ -127,6 +128,7 @@ public class PreStoreMeterPaymentBusiness implements IPaymentBusiness {
         reqJson.put("receivableAmount", reqJson.getDoubleValue("receivedAmount"));
         reqJson.put("receivedAmount", reqJson.getDoubleValue("receivedAmount"));
         reqJson.put("configId", feeConfigDtos.get(0).getConfigId());
+        reqJson.put("address", address);
         return paymentOrderDto;
     }
 
@@ -179,6 +181,7 @@ public class PreStoreMeterPaymentBusiness implements IPaymentBusiness {
         receivedAmountDec = receivedAmountDec.divide(new BigDecimal(feeConfigDtos.get(0).getSquarePrice()), 0, BigDecimal.ROUND_HALF_UP);
         List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
         feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_PROXY_CONSUMPTION, receivedAmountDec.doubleValue() + ""));
+        feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_METER_ADDRESS, reqJson.getString("address")));
 
         //todo 查询房屋信息
         RoomDto roomDto = new RoomDto();

service-job/src/main/java/com/java110/job/adapt/payment/smartMeter/SmartMeterAdapt.java

@@ -136,7 +136,9 @@ public class SmartMeterAdapt extends DatabusAdaptImpl {
             reqJson.put("roomId", feeDtos.get(0).getPayerObjId());
             reqJson.put("communityId", feeDtos.get(0).getCommunityId());
             reqJson.put("receivedAmount", payFeeDetailPo.getReceivedAmount());
-            reqJson.put("feeTypeCd",feeDtos.get(0).getFeeTypeCd());
+            reqJson.put("feeTypeCd", feeDtos.get(0).getFeeTypeCd());
+            String address = FeeAttrDto.getFeeAttrValue(feeDtos.get(0), FeeAttrDto.SPEC_CD_METER_ADDRESS);
+            reqJson.put("address", address);
 
             reqJson.put("iotApiCode", "preStoreMeterBmoImpl");