Просмотр исходного кода

费用配置中多加一个start_time 字段导致报错

wuxw лет назад: 6
Родитель
Сommit
9e65e409cb

+ 0 - 2
FeeService/src/main/java/com/java110/fee/listener/config/AbstractFeeConfigBusinessServiceDataFlowListener.java

@@ -42,7 +42,6 @@ businessFeeConfigInfo.put("operate",businessFeeConfigInfo.get("operate"));
 businessFeeConfigInfo.put("feeTypeCd",businessFeeConfigInfo.get("fee_type_cd"));
 businessFeeConfigInfo.put("configId",businessFeeConfigInfo.get("config_id"));
 businessFeeConfigInfo.put("additionalAmount",businessFeeConfigInfo.get("additional_amount"));
-businessFeeConfigInfo.put("startTime",businessFeeConfigInfo.get("start_time"));
 businessFeeConfigInfo.put("communityId",businessFeeConfigInfo.get("community_id"));
 businessFeeConfigInfo.remove("bId");
         businessFeeConfigInfo.put("statusCd", statusCd);
@@ -72,7 +71,6 @@ currentFeeConfigInfo.put("operate",currentFeeConfigInfo.get("operate"));
 currentFeeConfigInfo.put("feeTypeCd",currentFeeConfigInfo.get("fee_type_cd"));
 currentFeeConfigInfo.put("configId",currentFeeConfigInfo.get("config_id"));
 currentFeeConfigInfo.put("additionalAmount",currentFeeConfigInfo.get("additional_amount"));
-currentFeeConfigInfo.put("startTime",currentFeeConfigInfo.get("start_time"));
 currentFeeConfigInfo.put("communityId",currentFeeConfigInfo.get("community_id"));
 
 

+ 0 - 2
docs/services/fee/SaveFeeConfigInfo.md

@@ -48,7 +48,6 @@
 |businessFeeConfig|feeTypeCd|1|String|30|-|-|
 |businessFeeConfig|configId|1|String|30|-|-|
 |businessFeeConfig|additionalAmount|1|String|30|-|-|
-|businessFeeConfig|startTime|1|String|30|-|-|
 |businessFeeConfig|communityId|1|String|30|-|-|
 
 
@@ -96,7 +95,6 @@ Content-Type:application/json
         "feeTypeCd":"填写具体值",
         "configId":"填写具体值",
         "additionalAmount":"填写具体值",
-        "startTime":"填写具体值",
         "communityId":"填写具体值"
       }
     },

+ 0 - 2
docs/services/fee/UpdateFeeConfigInfo.md

@@ -48,7 +48,6 @@
 |businessFeeConfig|feeTypeCd|1|String|30|-|-|
 |businessFeeConfig|configId|1|String|30|-|-|
 |businessFeeConfig|additionalAmount|1|String|30|-|-|
-|businessFeeConfig|startTime|1|String|30|-|-|
 |businessFeeConfig|communityId|1|String|30|-|-|
 
 
@@ -96,7 +95,6 @@ Content-Type:application/json
         "feeTypeCd":"填写具体值",
         "configId":"填写具体值",
         "additionalAmount":"填写具体值",
-        "startTime":"填写具体值",
         "communityId":"填写具体值"
       }
     },

+ 0 - 7
java110-bean/src/main/java/com/java110/dto/FeeConfigDto.java

@@ -17,7 +17,6 @@ public class FeeConfigDto extends PageDto implements Serializable {
 private String feeTypeCd;
 private String configId;
 private String additionalAmount;
-private String startTime;
 private String communityId;
 
 
@@ -50,12 +49,6 @@ public String getAdditionalAmount() {
 public void setAdditionalAmount(String additionalAmount) {
         this.additionalAmount = additionalAmount;
     }
-public String getStartTime() {
-        return startTime;
-    }
-public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
 public String getCommunityId() {
         return communityId;
     }

+ 0 - 1
java110-code-generator/src/main/java/com/java110/PayFeeConfigGeneratorApplication.java

@@ -53,7 +53,6 @@ public class PayFeeConfigGeneratorApplication {
         param.put("bId", "b_id");
         param.put("squarePrice", "square_price");
         param.put("additionalAmount", "additional_amount");
-        param.put("startTime", "start_time");
         param.put("statusCd", "status_cd");
         param.put("operate", "operate");
         data.setParams(param);

+ 6 - 21
java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml

@@ -7,16 +7,16 @@
     <!-- 保存费用配置信息 add by wuxw 2018-07-03 -->
        <insert id="saveBusinessFeeConfigInfo" parameterType="Map">
            insert into business_pay_fee_config(
-square_price,operate,fee_type_cd,config_id,additional_amount,start_time,community_id,b_id
+square_price,operate,fee_type_cd,config_id,additional_amount,community_id,b_id
 ) values (
-#{squarePrice},#{operate},#{feeTypeCd},#{configId},#{additionalAmount},#{startTime},#{communityId},#{bId}
+#{squarePrice},#{operate},#{feeTypeCd},#{configId},#{additionalAmount},#{communityId},#{bId}
 )
        </insert>
 
 
        <!-- 查询费用配置信息(Business) add by wuxw 2018-07-03 -->
        <select id="getBusinessFeeConfigInfo" parameterType="Map" resultType="Map">
-           select  t.square_price,t.square_price squarePrice,t.operate,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.config_id,t.config_id configId,t.additional_amount,t.additional_amount additionalAmount,t.start_time,t.start_time startTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
+           select  t.square_price,t.square_price squarePrice,t.operate,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.config_id,t.config_id configId,t.additional_amount,t.additional_amount additionalAmount,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
 from business_pay_fee_config t 
 where 1 =1 
 <if test="squarePrice !=null and squarePrice != ''">
@@ -34,9 +34,6 @@ where 1 =1
 <if test="additionalAmount !=null and additionalAmount != ''">
    and t.additional_amount= #{additionalAmount}
 </if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
 <if test="communityId !=null and communityId != ''">
    and t.community_id= #{communityId}
 </if> 
@@ -53,8 +50,8 @@ where 1 =1
     <!-- 保存费用配置信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveFeeConfigInfoInstance" parameterType="Map">
         insert into pay_fee_config(
-square_price,fee_type_cd,config_id,additional_amount,start_time,status_cd,community_id,b_id
-) select t.square_price,t.fee_type_cd,t.config_id,t.additional_amount,t.start_time,'0',t.community_id,t.b_id from business_pay_fee_config t where 1=1
+square_price,fee_type_cd,config_id,additional_amount,status_cd,community_id,b_id
+) select t.square_price,t.fee_type_cd,t.config_id,t.additional_amount,'0',t.community_id,t.b_id from business_pay_fee_config t where 1=1
 <if test="squarePrice !=null and squarePrice != ''">
    and t.square_price= #{squarePrice}
 </if> 
@@ -68,9 +65,6 @@ square_price,fee_type_cd,config_id,additional_amount,start_time,status_cd,commun
 <if test="additionalAmount !=null and additionalAmount != ''">
    and t.additional_amount= #{additionalAmount}
 </if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
 <if test="communityId !=null and communityId != ''">
    and t.community_id= #{communityId}
 </if> 
@@ -84,7 +78,7 @@ square_price,fee_type_cd,config_id,additional_amount,start_time,status_cd,commun
 
     <!-- 查询费用配置信息 add by wuxw 2018-07-03 -->
     <select id="getFeeConfigInfo" parameterType="Map" resultType="Map">
-        select  t.square_price,t.square_price squarePrice,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.config_id,t.config_id configId,t.additional_amount,t.additional_amount additionalAmount,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
+        select  t.square_price,t.square_price squarePrice,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.config_id,t.config_id configId,t.additional_amount,t.additional_amount additionalAmount,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
 from pay_fee_config t 
 where 1 =1 
 <if test="squarePrice !=null and squarePrice != ''">
@@ -99,9 +93,6 @@ where 1 =1
 <if test="additionalAmount !=null and additionalAmount != ''">
    and t.additional_amount= #{additionalAmount}
 </if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
 <if test="statusCd !=null and statusCd != ''">
    and t.status_cd= #{statusCd}
 </if> 
@@ -135,9 +126,6 @@ where 1 =1
 <if test="additionalAmount !=null and additionalAmount != ''">
 , t.additional_amount= #{additionalAmount}
 </if> 
-<if test="startTime !=null and startTime != ''">
-, t.start_time= #{startTime}
-</if> 
 <if test="communityId !=null and communityId != ''">
 , t.community_id= #{communityId}
 </if> 
@@ -167,9 +155,6 @@ where 1 =1
 <if test="additionalAmount !=null and additionalAmount != ''">
    and t.additional_amount= #{additionalAmount}
 </if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
 <if test="statusCd !=null and statusCd != ''">
    and t.status_cd= #{statusCd}
 </if>