优化代码

java110-db/src/main/java/com/java110/db/druid/DuridConfig.java

@@ -11,7 +11,7 @@ import com.alibaba.druid.support.http.StatViewServlet;
 /**
  * durid 配置类
  */
-//@Configuration
+@Configuration
 public class DuridConfig {
 
 
@@ -23,7 +23,7 @@ public class DuridConfig {
      * 新建Filter
      * @return Filter
      */
-    //@Bean
+    @Bean
     public Filter statFilter() {
         StatFilter filter = new StatFilter();
         filter.setSlowSqlMillis(DEFAULT_SHOW_SQL_MILLIS);
@@ -42,7 +42,7 @@ public class DuridConfig {
         //创建servlet注册实体
         ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new StatViewServlet(), "/druid/*");
         //设置ip白名单
-        servletRegistrationBean.addInitParameter("allow", "127.0.0.1");
+        //servletRegistrationBean.addInitParameter("allow", "127.0.0.1");
         //设置ip黑名单，如果allow与deny共同存在时,deny优先于allow
         //servletRegistrationBean.addInitParameter("deny","192.168.0.19");
         //设置控制台管理用户

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

@@ -10,6 +10,7 @@ import com.java110.fee.bmo.feeDiscount.IGetFeeDiscountBMO;
 import com.java110.fee.bmo.feeDiscount.ISaveFeeDiscountBMO;
 import com.java110.fee.bmo.feeDiscount.IUpdateFeeDiscountBMO;
 import com.java110.fee.bmo.feeDiscountRule.IGetFeeDiscountRuleBMO;
+import com.java110.fee.bmo.feeDiscountRuleSpec.IComputeFeeDiscountBMO;
 import com.java110.fee.bmo.feeDiscountRuleSpec.IGetFeeDiscountRuleSpecBMO;
 import com.java110.po.feeDiscount.FeeDiscountPo;
 import com.java110.utils.util.Assert;
@@ -39,6 +40,9 @@ public class FeeDiscountApi {
     @Autowired
     private IGetFeeDiscountRuleSpecBMO getFeeDiscountRuleSpecBMOImpl;
 
+    @Autowired
+    private IComputeFeeDiscountBMO computeFeeDiscountBMOImpl;
+
     /**
      * 微信保存消息模板
      *
@@ -157,4 +161,21 @@ public class FeeDiscountApi {
         feeDiscountRuleSpecDto.setRuleId(ruleId);
         return getFeeDiscountRuleSpecBMOImpl.get(feeDiscountRuleSpecDto);
     }
+
+    /**
+     * 计算费用折扣
+     *
+     * @param communityId 小区ID
+     * @return
+     * @serviceCode /feeDiscount/computeFeeDiscount
+     * @path /app/feeDiscount/computeFeeDiscount
+     */
+    @RequestMapping(value = "/computeFeeDiscount", method = RequestMethod.GET)
+    public ResponseEntity<String> computeFeeDiscount(@RequestParam(value = "feeId") String feeId,
+                                                     @RequestParam(value = "communityId") String communityId,
+                                                     @RequestParam(value = "cycles") double cycles,
+                                                     @RequestParam(value = "page") int page,
+                                                     @RequestParam(value = "row") int row) {
+        return computeFeeDiscountBMOImpl.compute(feeId, communityId, cycles, page, row);
+    }
 }

service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/IComputeFeeDiscountBMO.java

@@ -0,0 +1,16 @@
+package com.java110.fee.bmo.feeDiscountRuleSpec;
+import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
+import org.springframework.http.ResponseEntity;
+
+public interface IComputeFeeDiscountBMO {
+
+
+    /**
+     * 查询折扣规则配置
+     * add by wuxw
+     * @return
+     */
+    ResponseEntity<String> compute(String feeId,String communityId,double cycles,int page,int row );
+
+
+}

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

@@ -0,0 +1,64 @@
+package com.java110.fee.bmo.feeDiscountRuleSpec.impl;
+
+import com.java110.dto.fee.FeeDto;
+import com.java110.dto.payFeeConfigDiscount.PayFeeConfigDiscountDto;
+import com.java110.fee.bmo.feeDiscountRuleSpec.IComputeFeeDiscountBMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeConfigDiscountInnerServiceSMO;
+import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("computeFeeDiscountBMOImpl")
+public class ComputeFeeDiscountBMOImpl implements IComputeFeeDiscountBMO {
+
+
+    @Autowired
+    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+    @Autowired
+    private IPayFeeConfigDiscountInnerServiceSMO payFeeConfigDiscountInnerServiceSMOImpl;
+
+
+    /**
+     * 计算折扣
+     *
+     * @param feeId
+     * @param communityId
+     * @param cycles
+     * @param page
+     * @param row
+     * @return
+     */
+    @Override
+    public ResponseEntity<String> compute(String feeId, String communityId, double cycles, int page, int row) {
+
+        FeeDto feeDto = new FeeDto();
+        feeDto.setFeeId(feeId);
+        feeDto.setCommunityId(communityId);
+        feeDto.setState(FeeDto.STATE_DOING);
+        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+        Assert.listOnlyOne(feeDtos, "费用不存在");
+
+        PayFeeConfigDiscountDto payFeeConfigDiscountDto = new PayFeeConfigDiscountDto();
+        payFeeConfigDiscountDto.setConfigId(feeDtos.get(0).getConfigId());
+        payFeeConfigDiscountDto.setCommunityId(communityId);
+        List<PayFeeConfigDiscountDto> payFeeConfigDiscountDtos =
+                payFeeConfigDiscountInnerServiceSMOImpl.queryPayFeeConfigDiscounts(payFeeConfigDiscountDto);
+
+        if (payFeeConfigDiscountDtos == null || payFeeConfigDiscountDtos.size() < 1) {
+            return ResultVo.success();
+        }
+
+
+        for(PayFeeConfigDiscountDto tmpPayFeeConfigDiscountDto : payFeeConfigDiscountDtos){
+
+        }
+
+        return null;
+    }
+}