优惠代码

java110-bean/src/main/java/com/java110/dto/payFeeBatch/PayFeeBatchDto.java

@@ -25,6 +25,7 @@ public class PayFeeBatchDto extends PageDto implements Serializable {
     private String createUserName;
     private String remark;
     private String state;
+    private String stateName;
     private String batchId;
     private String communityId;
 
@@ -106,4 +107,12 @@ public class PayFeeBatchDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-db/src/main/resources/mapper/fee/PayFeeBatchV1ServiceDaoImplMapper.xml

@@ -19,8 +19,9 @@
     <select id="getPayFeeBatchInfo" parameterType="Map" resultType="Map">
         select t.msg,t.create_user_id,t.create_user_id createUserId,t.create_user_name,t.create_user_name
         createUserName,t.status_cd,t.status_cd statusCd,t.remark,t.state,t.batch_id,t.batch_id
-        batchId,t.community_id,t.community_id communityId,t.create_time createTime
+        batchId,t.community_id,t.community_id communityId,t.create_time createTime,td.`name` stateName
         from pay_fee_batch t
+        left join t_dict td on t.state =  td.status_cd and td.table_name = 'pay_fee_batch' and td.table_columns = 'state'
         where 1 =1
         <if test="msg !=null and msg != ''">
             and t.msg= #{msg}

service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportRoomFeeSMOImpl.java

@@ -127,7 +127,6 @@ public class ImportRoomFeeSMOImpl extends DefaultAbstractComponentSMO implements
 
 
     @Override
-
     public ResponseEntity<String> importTempData(IPageData pd) {
         ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());

service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java

@@ -13,7 +13,12 @@ import com.java110.entity.assetImport.ImportRoomFee;
 import com.java110.fee.bmo.IImportRoomFee;
 import com.java110.fee.listener.fee.UpdateFeeInfoListener;
 import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.*;
+import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IImportFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IImportFeeInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.po.fee.FeeAttrPo;
@@ -481,6 +486,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         String storeId = reqJson.getString("storeId");
         String userId = reqJson.getString("userId");
         String feeName = reqJson.getString("feeName");
+        String batchId = reqJson.getString("batchId");
 
         if (StringUtil.isEmpty(feeName)) {
             feeName = IMPORT_FEE_NAME;
@@ -536,6 +542,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
             payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
             payFeePo.setAmount(importCarFee.getAmount());
             payFeePo.setStartTime(importCarFee.getStartTime());
+            payFeePo.setBatchId(batchId);
             //payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
 
             payFeePos.add(payFeePo);