Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-db/src/main/resources/mapper/oa/OaWorkflowFormServiceDaoImplMapper.xml

@@ -193,9 +193,8 @@
     <!-- 修改信息 -->
     <update id="updateOaWorkflowFormDataAll" parameterType="Map">
         update ${tableName} set
-            status_cd = '0'
             <foreach collection="columns" item="item" separator=",">
-                ,${item}
+                ${item}
             </foreach>
         where id = #{id}
     </update>

service-fee/src/main/java/com/java110/fee/discount/impl/ReductionMonthFeeRule.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.discount.impl;
+
+import com.java110.core.smo.IComputeFeeSMO;
+import com.java110.dto.fee.FeeDto;
+import com.java110.dto.feeDiscount.ComputeDiscountDto;
+import com.java110.dto.feeDiscount.FeeDiscountDto;
+import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
+import com.java110.fee.discount.IComputeDiscount;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 缴几个月赠送几个月 规则
+ *
+ * @desc add by 吴学文 10:27
+ */
+
+@Component(value = "reductionMonthFeeRule")
+public class ReductionMonthFeeRule implements IComputeDiscount {
+
+
+    /**
+     * 89002020980001	102020001	月份
+     * 89002020980002	102020001	打折率
+     */
+    private static final String SPEC_MONTH = "89002020980014"; //月份
+    private static final String SPEC_RATE = "89002020980015"; // 赠送月份
+
+
+    @Autowired
+    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+    @Autowired
+    private IComputeFeeSMO computeFeeSMOImpl;
+
+
+    @Override
+    public ComputeDiscountDto compute(FeeDiscountDto feeDiscountDto) {
+
+        List<FeeDiscountSpecDto> feeDiscountSpecDtos = feeDiscountDto.getFeeDiscountSpecs();
+
+        if (feeDiscountSpecDtos.size() < 1) {
+            return null;
+        }
+        double month = 0.0;
+        double reductionMonth = 0.0;
+        for (FeeDiscountSpecDto feeDiscountSpecDto : feeDiscountSpecDtos) {
+            if (SPEC_MONTH.equals(feeDiscountSpecDto.getSpecId())) {
+                month = Double.parseDouble(feeDiscountSpecDto.getSpecValue());
+            }
+            if (SPEC_RATE.equals(feeDiscountSpecDto.getSpecId())) {
+                reductionMonth = Double.parseDouble(feeDiscountSpecDto.getSpecValue());
+            }
+        }
+
+        if (feeDiscountDto.getCycles() < month) {
+            ComputeDiscountDto computeDiscountDto = new ComputeDiscountDto();
+            computeDiscountDto.setDiscountId(feeDiscountDto.getDiscountId());
+            computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_D);
+            computeDiscountDto.setRuleId(feeDiscountDto.getRuleId());
+            computeDiscountDto.setRuleName(feeDiscountDto.getRuleName());
+            computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName());
+            computeDiscountDto.setDiscountPrice(0.0);
+            computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
+            return computeDiscountDto;
+        }
+
+        //查询费用
+        FeeDto feeDto = new FeeDto();
+        feeDto.setCommunityId(feeDiscountDto.getCommunityId());
+        feeDto.setFeeId(feeDiscountDto.getFeeId());
+        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+        Map feePriceAll=computeFeeSMOImpl.getFeePrice(feeDtos.get(0));
+
+        BigDecimal priceDec = new BigDecimal(feePriceAll.get("feePrice").toString());
+
+        double cycleRate = Math.floor(feeDiscountDto.getCycles()/month);
+
+        BigDecimal cycleRateDec = new BigDecimal(cycleRate);
+
+
+        BigDecimal reductionMonthDec = new BigDecimal(reductionMonth);
+
+        double discountPrice = priceDec.multiply(cycleRateDec).multiply(reductionMonthDec).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+
+        ComputeDiscountDto computeDiscountDto = new ComputeDiscountDto();
+        computeDiscountDto.setDiscountId(feeDiscountDto.getDiscountId());
+        computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_D);
+        computeDiscountDto.setRuleId(feeDiscountDto.getRuleId());
+        computeDiscountDto.setRuleName(feeDiscountDto.getRuleName());
+        computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName());
+        computeDiscountDto.setDiscountPrice(discountPrice);
+        computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
+        return computeDiscountDto;
+    }
+}

service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java

@@ -50,7 +50,7 @@ import java.nio.charset.Charset;
         "com.java110.core", "com.java110.config.properties.code", "com.java110.db"})
 @EnableDiscoveryClient
 @Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
-        basePackages = {"com.java110.dev.cmd"})
+        basePackages = {"com.java110.oa.cmd"})
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
         basePackages = {"com.java110.oa.listener"})
 @EnableFeignClients(basePackages = {"com.java110.intf.user",

service-oa/src/main/java/com/java110/oa/cmd/oaWorkflow/UpdateOaWorkflowFormData.java

@@ -19,13 +19,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  * 修改表单数据
  */
-@Java110Cmd(serviceCode = "/oaWorkflow/updateOaWorkflowFormData")
+@Java110Cmd(serviceCode = "oaWorkflow.updateOaWorkflowFormData")
 public class UpdateOaWorkflowFormData extends AbstractServiceCmdListener {
 
     @Autowired
@@ -46,6 +47,9 @@ public class UpdateOaWorkflowFormData extends AbstractServiceCmdListener {
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        Map<String,String> headers = cmdDataFlowContext.getReqHeaders();
+
+        reqJson.put("storeId",headers.get("store-id"));
 
         OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
         oaWorkflowFormDto.setFlowId(reqJson.get("flowId").toString());
@@ -71,12 +75,11 @@ public class UpdateOaWorkflowFormData extends AbstractServiceCmdListener {
         }
 
         List<String> columns = new ArrayList<>();
-        List<String> values = new ArrayList<>();
         for (String key : reqJson.keySet()) {
-            if ("flowId".equals(key) || "id".equals(key)) {
+            if ("flowId".equals(key) || "id".equals(key) || "storeId".equals(key)) {
                 continue;
             }
-            columns.add(key + "=" + reqJson.getString(key));
+            columns.add(key + "='" + reqJson.getString(key)+"'");
 
             //简单校验
             validateColumns(columns);
@@ -107,7 +110,7 @@ public class UpdateOaWorkflowFormData extends AbstractServiceCmdListener {
     }
 
     public static boolean containsSqlInjection(Object obj) {
-        Pattern pattern = Pattern.compile("\\b(exec|insert|select|drop|grant|alter|delete|update|count|chr|mid|master|truncate|char|declare)\\b|(\\*|;|\\+|'|%)");
+        Pattern pattern = Pattern.compile("\\b(exec|insert|select|drop|grant|alter|delete|update|count|chr|mid|master|truncate|char|declare)");
         Matcher matcher = pattern.matcher(obj.toString().toLowerCase());
         return matcher.find();
     }