物业端积分功能开发完成

java110-bean/src/main/java/com/java110/dto/integral/IntegralRuleFeeDto.java

@@ -15,14 +15,11 @@ import java.util.Date;
  **/
 public class IntegralRuleFeeDto extends PageDto implements Serializable {
 
-    private String payMonth;
     private String irfId;
-    private String feeConfigName;
     private String payStartTime;
     private String payEndTime;
     private String ruleId;
     private String communityId;
-    private String feeConfigId;
 
     private String curTime;
     private String cycle;
@@ -33,14 +30,6 @@ public class IntegralRuleFeeDto extends PageDto implements Serializable {
     private String statusCd = "0";
 
 
-    public String getPayMonth() {
-        return payMonth;
-    }
-
-    public void setPayMonth(String payMonth) {
-        this.payMonth = payMonth;
-    }
-
     public String getIrfId() {
         return irfId;
     }
@@ -49,14 +38,6 @@ public class IntegralRuleFeeDto extends PageDto implements Serializable {
         this.irfId = irfId;
     }
 
-    public String getFeeConfigName() {
-        return feeConfigName;
-    }
-
-    public void setFeeConfigName(String feeConfigName) {
-        this.feeConfigName = feeConfigName;
-    }
-
     public String getPayStartTime() {
         return payStartTime;
     }
@@ -89,14 +70,6 @@ public class IntegralRuleFeeDto extends PageDto implements Serializable {
         this.communityId = communityId;
     }
 
-    public String getFeeConfigId() {
-        return feeConfigId;
-    }
-
-    public void setFeeConfigId(String feeConfigId) {
-        this.feeConfigId = feeConfigId;
-    }
-
 
     public Date getCreateTime() {
         return createTime;

java110-bean/src/main/java/com/java110/po/integral/IntegralRuleFeePo.java

@@ -28,23 +28,13 @@ import java.util.Date;
  */
 public class IntegralRuleFeePo implements Serializable {
 
-    private String payMonth;
     private String irfId;
-    private String feeConfigName;
     private String payStartTime;
     private String payEndTime;
     private String statusCd = "0";
     private String ruleId;
     private String communityId;
-    private String feeConfigId;
 
-    public String getPayMonth() {
-        return payMonth;
-    }
-
-    public void setPayMonth(String payMonth) {
-        this.payMonth = payMonth;
-    }
 
     public String getIrfId() {
         return irfId;
@@ -54,13 +44,6 @@ public class IntegralRuleFeePo implements Serializable {
         this.irfId = irfId;
     }
 
-    public String getFeeConfigName() {
-        return feeConfigName;
-    }
-
-    public void setFeeConfigName(String feeConfigName) {
-        this.feeConfigName = feeConfigName;
-    }
 
     public String getPayStartTime() {
         return payStartTime;
@@ -102,13 +85,5 @@ public class IntegralRuleFeePo implements Serializable {
         this.communityId = communityId;
     }
 
-    public String getFeeConfigId() {
-        return feeConfigId;
-    }
-
-    public void setFeeConfigId(String feeConfigId) {
-        this.feeConfigId = feeConfigId;
-    }
-
 
 }

java110-db/src/main/resources/mapper/acct/IntegralRuleFeeV1ServiceDaoImplMapper.xml

@@ -8,33 +8,25 @@
     <!-- 保存积分规则费用信息 add by wuxw 2018-07-03 -->
     <insert id="saveIntegralRuleFeeInfo" parameterType="Map">
         insert into integral_rule_fee(
-        pay_month,irf_id,fee_config_name,pay_start_time,pay_end_time,rule_id,community_id,fee_config_id
+        irf_id,pay_start_time,pay_end_time,rule_id,community_id
         ) values (
-        #{payMonth},#{irfId},#{feeConfigName},#{payStartTime},#{payEndTime},#{ruleId},#{communityId},#{feeConfigId}
+        #{irfId},#{payStartTime},#{payEndTime},#{ruleId},#{communityId}
         )
     </insert>
 
 
     <!-- 查询积分规则费用信息 add by wuxw 2018-07-03 -->
     <select id="getIntegralRuleFeeInfo" parameterType="Map" resultType="Map">
-        select t.pay_month,t.pay_month payMonth,t.irf_id,t.irf_id irfId,t.fee_config_name,t.fee_config_name
-        feeConfigName,t.pay_start_time,t.pay_start_time payStartTime,t.pay_end_time,t.pay_end_time
+        select t.irf_id,t.irf_id irfId,t.pay_start_time,t.pay_start_time payStartTime,t.pay_end_time,t.pay_end_time
         payEndTime,t.status_cd,t.status_cd statusCd,t.rule_id,t.rule_id ruleId,t.community_id,t.community_id
-        communityId,t.fee_config_id,t.fee_config_id feeConfigId
+        communityId
         from integral_rule_fee t
         where 1 =1
-        <if test="payMonth !=null and payMonth != ''">
-            and t.pay_month= #{payMonth}
-        </if>
-        <if test="cycle !=null and cycle != ''">
-            and t.pay_month &lt;= #{cycle}
-        </if>
+
         <if test="irfId !=null and irfId != ''">
             and t.irf_id= #{irfId}
         </if>
-        <if test="feeConfigName !=null and feeConfigName != ''">
-            and t.fee_config_name= #{feeConfigName}
-        </if>
+
         <if test="payStartTime !=null and payStartTime != ''">
             and t.pay_start_time= #{payStartTime}
         </if>
@@ -54,9 +46,7 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="feeConfigId !=null and feeConfigId != ''">
-            and t.fee_config_id= #{feeConfigId}
-        </if>
+
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -71,12 +61,6 @@
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="payMonth !=null and payMonth != ''">
-            , t.pay_month= #{payMonth}
-        </if>
-        <if test="feeConfigName !=null and feeConfigName != ''">
-            , t.fee_config_name= #{feeConfigName}
-        </if>
         <if test="payStartTime !=null and payStartTime != ''">
             , t.pay_start_time= #{payStartTime}
         </if>
@@ -86,9 +70,6 @@
         <if test="ruleId !=null and ruleId != ''">
             , t.rule_id= #{ruleId}
         </if>
-        <if test="feeConfigId !=null and feeConfigId != ''">
-            , t.fee_config_id= #{feeConfigId}
-        </if>
         where 1=1
         <if test="irfId !=null and irfId != ''">
             and t.irf_id= #{irfId}
@@ -103,18 +84,11 @@
         select count(1) count
         from integral_rule_fee t
         where 1 =1
-        <if test="payMonth !=null and payMonth != ''">
-            and t.pay_month= #{payMonth}
-        </if>
-        <if test="cycle !=null and cycle != ''">
-            and t.pay_month &lt;= #{cycle}
-        </if>
+
         <if test="irfId !=null and irfId != ''">
             and t.irf_id= #{irfId}
         </if>
-        <if test="feeConfigName !=null and feeConfigName != ''">
-            and t.fee_config_name= #{feeConfigName}
-        </if>
+
         <if test="payStartTime !=null and payStartTime != ''">
             and t.pay_start_time= #{payStartTime}
         </if>
@@ -134,9 +108,6 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="feeConfigId !=null and feeConfigId != ''">
-            and t.fee_config_id= #{feeConfigId}
-        </if>
 
 
     </select>

service-acct/src/main/java/com/java110/acct/cmd/integral/ComputePayFeeIntegralCmd.java

@@ -88,7 +88,6 @@ public class ComputePayFeeIntegralCmd extends Cmd {
         Assert.listOnlyOne(feeDtos,"费用不存在");
 
         IntegralRuleFeeDto integralRuleFeeDto = new IntegralRuleFeeDto();
-        integralRuleFeeDto.setFeeConfigId(feeDtos.get(0).getConfigId());
         integralRuleFeeDto.setCurTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         integralRuleFeeDto.setCommunityId(reqJson.getString("communityId"));
         integralRuleFeeDto.setCycle(reqJson.getString("cycles"));

service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralRuleFeeCmd.java

@@ -63,32 +63,18 @@ public class SaveIntegralRuleFeeCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");
-        Assert.hasKeyAndValue(reqJson, "feeConfigId", "请求报文中未包含feeConfigId");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
         Assert.hasKeyAndValue(reqJson, "payStartTime", "请求报文中未包含payStartTime");
         Assert.hasKeyAndValue(reqJson, "payEndTime", "请求报文中未包含payEndTime");
-        Assert.hasKeyAndValue(reqJson, "payMonth", "请求报文中未包含payMonth");
-        IntegralRuleFeeDto integralRuleFeeDto = new IntegralRuleFeeDto();
-        integralRuleFeeDto.setRuleId(reqJson.getString("ruleId"));
-        integralRuleFeeDto.setFeeConfigId(reqJson.getString("feeConfigId"));
-        long count = integralRuleFeeV1InnerServiceSMOImpl.queryIntegralRuleFeesCount(integralRuleFeeDto);
 
-        if(count > 0){
-            throw new CmdException("费用项已经关联");
-        }
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-        FeeConfigDto feeConfigDto = new FeeConfigDto();
-        feeConfigDto.setConfigId(reqJson.getString("feeConfigId"));
-        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
 
-        Assert.listOnlyOne(feeConfigDtos,"费用项不存在");
         IntegralRuleFeePo integralRuleFeePo = BeanConvertUtil.covertBean(reqJson, IntegralRuleFeePo.class);
         integralRuleFeePo.setIrfId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        integralRuleFeePo.setFeeConfigName(feeConfigDtos.get(0).getFeeName());
         int flag = integralRuleFeeV1InnerServiceSMOImpl.saveIntegralRuleFee(integralRuleFeePo);
 
         if (flag < 1) {

service-acct/src/main/java/com/java110/acct/cmd/integral/UpdateIntegralRuleFeeCmd.java

@@ -69,13 +69,8 @@ public class UpdateIntegralRuleFeeCmd extends Cmd {
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-        FeeConfigDto feeConfigDto = new FeeConfigDto();
-        feeConfigDto.setConfigId(reqJson.getString("feeConfigId"));
-        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
 
-        Assert.listOnlyOne(feeConfigDtos,"费用项不存在");
         IntegralRuleFeePo integralRuleFeePo = BeanConvertUtil.covertBean(reqJson, IntegralRuleFeePo.class);
-        integralRuleFeePo.setFeeConfigName(feeConfigDtos.get(0).getFeeName());
         int flag = integralRuleFeeV1InnerServiceSMOImpl.updateIntegralRuleFee(integralRuleFeePo);
 
         if (flag < 1) {

service-acct/src/main/java/com/java110/acct/dao/impl/IntegralRuleFeeV1ServiceDaoImpl.java

@@ -71,9 +71,9 @@ public class IntegralRuleFeeV1ServiceDaoImpl extends BaseServiceDao implements I
     public List<Map> getIntegralRuleFeeInfo(Map info) throws DAOException {
         logger.debug("查询 getIntegralRuleFeeInfo 入参 info : {}",info);
 
-        List<Map> businessIntegralRuleFeeInfos = sqlSessionTemplate.selectList("integralRuleFeeV1ServiceDaoImpl.getIntegralRuleFeeInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("integralRuleFeeV1ServiceDaoImpl.getIntegralRuleFeeInfo",info);
 
-        return businessIntegralRuleFeeInfos;
+        return infos;
     }