优化代码

java110-bean/src/main/java/com/java110/dto/feeDiscountRule/FeeDiscountRuleDto.java

@@ -1,8 +1,11 @@
 package com.java110.dto.feeDiscountRule;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -15,9 +18,11 @@ import java.util.Date;
 public class FeeDiscountRuleDto extends PageDto implements Serializable {
 
     private String ruleName;
-private String remark;
-private String ruleId;
-private String beanImpl;
+    private String remark;
+    private String ruleId;
+    private String beanImpl;
+
+    private List<FeeDiscountRuleSpecDto> feeDiscountRuleSpecs;
 
 
     private Date createTime;
@@ -28,25 +33,32 @@ private String beanImpl;
     public String getRuleName() {
         return ruleName;
     }
-public void setRuleName(String ruleName) {
+
+    public void setRuleName(String ruleName) {
         this.ruleName = ruleName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getBeanImpl() {
+
+    public String getBeanImpl() {
         return beanImpl;
     }
-public void setBeanImpl(String beanImpl) {
+
+    public void setBeanImpl(String beanImpl) {
         this.beanImpl = beanImpl;
     }
 
@@ -66,4 +78,12 @@ public void setBeanImpl(String beanImpl) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<FeeDiscountRuleSpecDto> getFeeDiscountRuleSpecs() {
+        return feeDiscountRuleSpecs;
+    }
+
+    public void setFeeDiscountRuleSpecs(List<FeeDiscountRuleSpecDto> feeDiscountRuleSpecs) {
+        this.feeDiscountRuleSpecs = feeDiscountRuleSpecs;
+    }
 }

java110-bean/src/main/java/com/java110/dto/feeDiscountRuleSpec/FeeDiscountRuleSpecDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.feeDiscountRuleSpec;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,9 +16,10 @@ import java.util.Date;
 public class FeeDiscountRuleSpecDto extends PageDto implements Serializable {
 
     private String specId;
-private String specName;
-private String remark;
-private String ruleId;
+    private String specName;
+    private String remark;
+    private String ruleId;
+    private String[] ruleIds;
 
 
     private Date createTime;
@@ -28,25 +30,32 @@ private String ruleId;
     public String getSpecId() {
         return specId;
     }
-public void setSpecId(String specId) {
+
+    public void setSpecId(String specId) {
         this.specId = specId;
     }
-public String getSpecName() {
+
+    public String getSpecName() {
         return specName;
     }
-public void setSpecName(String specName) {
+
+    public void setSpecName(String specName) {
         this.specName = specName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
 
@@ -66,4 +75,12 @@ public void setRuleId(String ruleId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getRuleIds() {
+        return ruleIds;
+    }
+
+    public void setRuleIds(String[] ruleIds) {
+        this.ruleIds = ruleIds;
+    }
 }

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

@@ -5,93 +5,96 @@
 <mapper namespace="feeDiscountRuleSpecServiceDaoImpl">
 
 
-
-
-
     <!-- 保存折扣规则配置信息 add by wuxw 2018-07-03 -->
     <insert id="saveFeeDiscountRuleSpecInfo" parameterType="Map">
         insert into fee_discount_rule_spec(
-spec_id,spec_name,remark,rule_id
-) values (
-#{specId},#{specName},#{remark},#{ruleId}
-)
+        spec_id,spec_name,remark,rule_id
+        ) values (
+        #{specId},#{specName},#{remark},#{ruleId}
+        )
     </insert>
 
 
-
     <!-- 查询折扣规则配置信息 add by wuxw 2018-07-03 -->
     <select id="getFeeDiscountRuleSpecInfo" parameterType="Map" resultType="Map">
-        select  t.spec_id,t.spec_id specId,t.spec_name,t.spec_name specName,t.remark,t.status_cd,t.status_cd statusCd,t.rule_id,t.rule_id ruleId 
-from fee_discount_rule_spec t 
-where 1 =1 
-<if test="specId !=null and specId != ''">
-   and t.spec_id= #{specId}
-</if> 
-<if test="specName !=null and specName != ''">
-   and t.spec_name= #{specName}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</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> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.spec_id,t.spec_id specId,t.spec_name,t.spec_name specName,t.remark,t.status_cd,t.status_cd
+        statusCd,t.rule_id,t.rule_id ruleId
+        from fee_discount_rule_spec t
+        where 1 =1
+        <if test="specId !=null and specId != ''">
+            and t.spec_id= #{specId}
+        </if>
+        <if test="specName !=null and specName != ''">
+            and t.spec_name= #{specName}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </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="ruleIds !=null ">
+            and t.rule_id in
+            <foreach collection="ruleIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </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="updateFeeDiscountRuleSpecInfo" parameterType="Map">
-        update  fee_discount_rule_spec t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="specName !=null and specName != ''">
-, t.spec_name= #{specName}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="ruleId !=null and ruleId != ''">
-, t.rule_id= #{ruleId}
-</if> 
- where 1=1 <if test="specId !=null and specId != ''">
-and t.spec_id= #{specId}
-</if> 
+        update fee_discount_rule_spec t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="specName !=null and specName != ''">
+            , t.spec_name= #{specName}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            , t.rule_id= #{ruleId}
+        </if>
+        where 1=1
+        <if test="specId !=null and specId != ''">
+            and t.spec_id= #{specId}
+        </if>
 
     </update>
 
     <!-- 查询折扣规则配置数量 add by wuxw 2018-07-03 -->
-     <select id="queryFeeDiscountRuleSpecsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from fee_discount_rule_spec t 
-where 1 =1 
-<if test="specId !=null and specId != ''">
-   and t.spec_id= #{specId}
-</if> 
-<if test="specName !=null and specName != ''">
-   and t.spec_name= #{specName}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</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> 
+    <select id="queryFeeDiscountRuleSpecsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from fee_discount_rule_spec t
+        where 1 =1
+        <if test="specId !=null and specId != ''">
+            and t.spec_id= #{specId}
+        </if>
+        <if test="specName !=null and specName != ''">
+            and t.spec_name= #{specName}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </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>
 
 
-     </select>
+    </select>
 
 </mapper>

service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java

@@ -124,13 +124,13 @@ public class FeeDiscountApi {
     /**
      * 微信删除消息模板
      *
-     * @param communityId 小区ID
+
      * @return
      * @serviceCode /feeDiscount/queryFeeDiscountRule
      * @path /app/feeDiscount/queryFeeDiscountRule
      */
     @RequestMapping(value = "/queryFeeDiscountRule", method = RequestMethod.GET)
-    public ResponseEntity<String> queryFeeDiscountRule(@RequestParam(value = "communityId") String communityId,
+    public ResponseEntity<String> queryFeeDiscountRule(
                                                        @RequestParam(value = "page") int page,
                                                        @RequestParam(value = "row") int row) {
         FeeDiscountRuleDto feeDiscountRuleDto = new FeeDiscountRuleDto();

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

@@ -1,8 +1,10 @@
 package com.java110.fee.bmo.feeDiscountRule.impl;
 
 import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
+import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
 import com.java110.fee.bmo.feeDiscountRule.IGetFeeDiscountRuleBMO;
 import com.java110.intf.fee.IFeeDiscountRuleInnerServiceSMO;
+import com.java110.intf.fee.IFeeDiscountRuleSpecInnerServiceSMO;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -18,6 +20,9 @@ public class GetFeeDiscountRuleBMOImpl implements IGetFeeDiscountRuleBMO {
     @Autowired
     private IFeeDiscountRuleInnerServiceSMO feeDiscountRuleInnerServiceSMOImpl;
 
+    @Autowired
+    private IFeeDiscountRuleSpecInnerServiceSMO feeDiscountRuleSpecInnerServiceSMOImpl;
+
     /**
      * @param feeDiscountRuleDto
      * @return 订单服务能够接受的报文
@@ -30,6 +35,8 @@ public class GetFeeDiscountRuleBMOImpl implements IGetFeeDiscountRuleBMO {
         List<FeeDiscountRuleDto> feeDiscountRuleDtos = null;
         if (count > 0) {
             feeDiscountRuleDtos = feeDiscountRuleInnerServiceSMOImpl.queryFeeDiscountRules(feeDiscountRuleDto);
+
+            freshRuleSpec(feeDiscountRuleDtos);
         } else {
             feeDiscountRuleDtos = new ArrayList<>();
         }
@@ -41,4 +48,32 @@ public class GetFeeDiscountRuleBMOImpl implements IGetFeeDiscountRuleBMO {
         return responseEntity;
     }
 
+    private void freshRuleSpec(List<FeeDiscountRuleDto> feeDiscountRuleDtos) {
+
+        List<String> ruleIds = new ArrayList<>();
+        for (FeeDiscountRuleDto feeDiscountRuleDto : feeDiscountRuleDtos) {
+            ruleIds.add(feeDiscountRuleDto.getRuleId());
+        }
+
+        if (ruleIds.size() < 1) {
+            return;
+        }
+
+
+        FeeDiscountRuleSpecDto feeDiscountRuleSpecDto = new FeeDiscountRuleSpecDto();
+        feeDiscountRuleSpecDto.setRuleIds(ruleIds.toArray(new String[ruleIds.size()]));
+        List<FeeDiscountRuleSpecDto> feeDiscountRuleSpecDtos
+                = feeDiscountRuleSpecInnerServiceSMOImpl.queryFeeDiscountRuleSpecs(feeDiscountRuleSpecDto);
+        List<FeeDiscountRuleSpecDto> tmpSpecs = null;
+        for (FeeDiscountRuleDto feeDiscountRuleDto : feeDiscountRuleDtos) {
+            tmpSpecs = new ArrayList<>();
+            for (FeeDiscountRuleSpecDto tmpFeeDiscountRuleSpecDto : feeDiscountRuleSpecDtos) {
+                if (feeDiscountRuleDto.getRuleId().equals(tmpFeeDiscountRuleSpecDto.getRuleId())) {
+                    tmpSpecs.add(tmpFeeDiscountRuleSpecDto);
+                }
+            }
+            feeDiscountRuleDto.setFeeDiscountRuleSpecs(tmpSpecs);
+        }
+    }
+
 }