加入小区优化

java110-bean/src/main/java/com/java110/dto/integralRuleConfig/IntegralRuleConfigDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.integralRuleConfig;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,9 +16,20 @@ import java.util.Date;
 public class IntegralRuleConfigDto extends PageDto implements Serializable {
 
     private String configId;
-private String ircId;
-private String ruleId;
-private String communityId;
+    private String configName;
+
+    private String squarePrice;
+    private String computingFormula;
+
+    private String additionalAmount;
+    private String scale;
+
+    private String computingFormulaName;
+
+    private String scaleName;
+    private String ircId;
+    private String ruleId;
+    private String communityId;
 
 
     private Date createTime;
@@ -28,25 +40,32 @@ private String communityId;
     public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getIrcId() {
+
+    public String getIrcId() {
         return ircId;
     }
-public void setIrcId(String ircId) {
+
+    public void setIrcId(String ircId) {
         this.ircId = ircId;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -66,4 +85,60 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getConfigName() {
+        return configName;
+    }
+
+    public void setConfigName(String configName) {
+        this.configName = configName;
+    }
+
+    public String getSquarePrice() {
+        return squarePrice;
+    }
+
+    public void setSquarePrice(String squarePrice) {
+        this.squarePrice = squarePrice;
+    }
+
+    public String getComputingFormula() {
+        return computingFormula;
+    }
+
+    public void setComputingFormula(String computingFormula) {
+        this.computingFormula = computingFormula;
+    }
+
+    public String getAdditionalAmount() {
+        return additionalAmount;
+    }
+
+    public void setAdditionalAmount(String additionalAmount) {
+        this.additionalAmount = additionalAmount;
+    }
+
+    public String getScale() {
+        return scale;
+    }
+
+    public void setScale(String scale) {
+        this.scale = scale;
+    }
+
+    public String getComputingFormulaName() {
+        return computingFormulaName;
+    }
+
+    public void setComputingFormulaName(String computingFormulaName) {
+        this.computingFormulaName = computingFormulaName;
+    }
+
+    public String getScaleName() {
+        return scaleName;
+    }
+
+    public void setScaleName(String scaleName) {
+        this.scaleName = scaleName;
+    }
 }

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

@@ -5,93 +5,94 @@
 <mapper namespace="integralRuleConfigV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存积分规则标准信息 add by wuxw 2018-07-03 -->
     <insert id="saveIntegralRuleConfigInfo" parameterType="Map">
         insert into integral_rule_config(
-config_id,irc_id,rule_id,community_id
-) values (
-#{configId},#{ircId},#{ruleId},#{communityId}
-)
+        config_id,irc_id,rule_id,community_id
+        ) values (
+        #{configId},#{ircId},#{ruleId},#{communityId}
+        )
     </insert>
 
 
-
     <!-- 查询积分规则标准信息 add by wuxw 2018-07-03 -->
     <select id="getIntegralRuleConfigInfo" parameterType="Map" resultType="Map">
-        select  t.config_id,t.config_id configId,t.irc_id,t.irc_id ircId,t.status_cd,t.status_cd statusCd,t.rule_id,t.rule_id ruleId,t.community_id,t.community_id communityId 
-from integral_rule_config t 
-where 1 =1 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="ircId !=null and ircId != ''">
-   and t.irc_id= #{ircId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ruleId !=null and ruleId != ''">
-   and t.rule_id= #{ruleId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.config_id,t.config_id configId,t.irc_id,t.irc_id ircId,t.status_cd,t.status_cd
+        statusCd,t.rule_id,t.rule_id ruleId,t.community_id,t.community_id communityId,
+        ic.square_price squarePrice,ic.config_name
+        configName,ic.computing_formula computingFormula,ic.additional_amount additionalAmount,ic.scale,td.name computingFormulaName,td1.`name` scaleName
+        from integral_rule_config t
+        left join integral_config ic on t.config_id = ic.config_id and ic.status_cd = '0'
+        left join t_dict td on ic.computing_formula = td.status_cd and td.table_name = 'integral_config' and td.table_columns = 'computing_formula'
+        left join t_dict td1 on ic.scale = td1.status_cd and td1.table_name = 'integral_config' and td1.table_columns = 'scale'
+        where 1 =1
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="ircId !=null and ircId != ''">
+            and t.irc_id= #{ircId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改积分规则标准信息 add by wuxw 2018-07-03 -->
     <update id="updateIntegralRuleConfigInfo" parameterType="Map">
-        update  integral_rule_config t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="configId !=null and configId != ''">
-, t.config_id= #{configId}
-</if> 
-<if test="ruleId !=null and ruleId != ''">
-, t.rule_id= #{ruleId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="ircId !=null and ircId != ''">
-and t.irc_id= #{ircId}
-</if> 
+        update integral_rule_config t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="configId !=null and configId != ''">
+            , t.config_id= #{configId}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            , t.rule_id= #{ruleId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        where 1=1
+        <if test="ircId !=null and ircId != ''">
+            and t.irc_id= #{ircId}
+        </if>
 
     </update>
 
     <!-- 查询积分规则标准数量 add by wuxw 2018-07-03 -->
-     <select id="queryIntegralRuleConfigsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from integral_rule_config t 
-where 1 =1 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="ircId !=null and ircId != ''">
-   and t.irc_id= #{ircId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ruleId !=null and ruleId != ''">
-   and t.rule_id= #{ruleId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
+    <select id="queryIntegralRuleConfigsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from integral_rule_config t
+        where 1 =1
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="ircId !=null and ircId != ''">
+            and t.irc_id= #{ircId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

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

@@ -55,8 +55,8 @@ public class SaveIntegralRuleConfigCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");
-Assert.hasKeyAndValue(reqJson, "configId", "请求报文中未包含configId");
-Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "configId", "请求报文中未包含configId");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
 
     }
 
@@ -64,7 +64,7 @@ Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含community
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       IntegralRuleConfigPo integralRuleConfigPo = BeanConvertUtil.covertBean(reqJson, IntegralRuleConfigPo.class);
+        IntegralRuleConfigPo integralRuleConfigPo = BeanConvertUtil.covertBean(reqJson, IntegralRuleConfigPo.class);
         integralRuleConfigPo.setIrcId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = integralRuleConfigV1InnerServiceSMOImpl.saveIntegralRuleConfig(integralRuleConfigPo);