Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-20 c57c5f9843dcd99d908aa3b6bddb0c3793ebf3e9

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop


 Conflicts:

	zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java

 zq-erp/src/main/java/com/matrix/core/tools/DingDingRobotUtil.java

@@ -70,6 +70,7 @@
            response = httpclient.execute(httppost);
            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
                String result = EntityUtils.toString(response.getEntity(), "utf-8");
                LogUtil.debug("发送钉钉结果"+result);
            }
        } catch (IOException e) {
            e.printStackTrace();

 zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java

@@ -5,10 +5,7 @@
import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.RSAUtils;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.*;
import com.matrix.core.web.BaseAction;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
@@ -23,10 +20,7 @@
import com.matrix.system.hive.statistics.StatisticsBusinessDataJob;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;

import java.security.Key;
import java.util.Map;
@@ -56,7 +50,7 @@
    StatisticsBusinessDataJob sjobp;
    @RequestMapping(value = "/job")
    public @ResponseBody  String job() {
        sjobp.executeExt2();
        //sjobp.executeExt2();
        return "1";
    }

@@ -262,4 +256,23 @@



    @Autowired


    /**
     * 官网联系我们通知
     */
    @RequestMapping(value = "/gwLinkUs")
    public @ResponseBody
    AjaxResult gwLinkUs(@RequestBody Map<String , Object> param) {

        String title = "hive新客户在官网提交联系请求";
        String content = "hive=>name:" + param.get("name") + "  tel：" +  param.get("tel") ;
        DingDingRobotUtil.sendLink("https://oapi.dingtalk.com/robot/send?access_token=62bb902f0e3945f0ece31306b99abae043fc69a66da0ef04d89fd20bf58d88d8", content, title, "", "www.baidu.com");

        return AjaxResult.buildSuccessInstance("提交成功");
    }



}

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -552,16 +552,24 @@
                &&StringUtils.isNotBlank(cashConsumption.getParamValue())){

            BigDecimal scoreSetting0 = new BigDecimal(cashConsumption.getParamValue());
            cashScore[0]= cashPayAmount.divide(scoreSetting0).intValue();
            if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
                cashScore[0] = cashPayAmount.divide(scoreSetting0).intValue();
            }

            if(StringUtils.isNotBlank(cashConsumption.getParamValue1())){
                BigDecimal scoreSetting1 = new BigDecimal(cashConsumption.getParamValue1());
                cashScore[1]= cashPayAmount.divide(scoreSetting1).intValue();
                if(scoreSetting1.compareTo(BigDecimal.ZERO)>0){
                    cashScore[1]= cashPayAmount.divide(scoreSetting1).intValue();
                }

            }

            if(StringUtils.isNotBlank(cashConsumption.getParamValue2())){
                BigDecimal scoreSetting2 = new BigDecimal(cashConsumption.getParamValue2());
                cashScore[2]= cashPayAmount.divide(scoreSetting2).intValue();
                if(scoreSetting2.compareTo(BigDecimal.ZERO)>0){
                    cashScore[2]= cashPayAmount.divide(scoreSetting2).intValue();
                }

            }
        }

@@ -577,16 +585,22 @@
                &&StringUtils.isNotBlank(principalBalanceConsumption.getParamValue())){

            BigDecimal scoreSetting0 = new BigDecimal(principalBalanceConsumption.getParamValue());
            cardScore[0]= cardPayAmount.divide(scoreSetting0).intValue();
            if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
                cardScore[0] = cardPayAmount.divide(scoreSetting0).intValue();
            }

            if(StringUtils.isNotBlank(principalBalanceConsumption.getParamValue1())){
                BigDecimal scoreSetting1 = new BigDecimal(principalBalanceConsumption.getParamValue1());
                cardScore[1]= cardPayAmount.divide(scoreSetting1).intValue();
                if(scoreSetting1.compareTo(BigDecimal.ZERO)>0) {
                    cardScore[1] = cardPayAmount.divide(scoreSetting1).intValue();
                }
            }

            if(StringUtils.isNotBlank(principalBalanceConsumption.getParamValue2())){
                BigDecimal scoreSetting2 = new BigDecimal(principalBalanceConsumption.getParamValue2());
                cardScore[2]= cardPayAmount.divide(scoreSetting2).intValue();
                if(scoreSetting2.compareTo(BigDecimal.ZERO)>0) {
                    cardScore[2] = cardPayAmount.divide(scoreSetting2).intValue();
                }
            }
        }

@@ -601,16 +615,22 @@
                &&StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue())){

            BigDecimal scoreSetting0 = new BigDecimal(bonusBalanceConsumption.getParamValue());
            giftScore[0]= giftPayAmount.divide(scoreSetting0).intValue();
            if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
                giftScore[0] = giftPayAmount.divide(scoreSetting0).intValue();
            }

            if(StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue1())){
                BigDecimal scoreSetting1 = new BigDecimal(bonusBalanceConsumption.getParamValue1());
                giftScore[1]= giftPayAmount.divide(scoreSetting1).intValue();
                if(scoreSetting1.compareTo(BigDecimal.ZERO)>0) {
                    giftScore[1] = giftPayAmount.divide(scoreSetting1).intValue();
                }
            }

            if(StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue2())){
                BigDecimal scoreSetting2 = new BigDecimal(bonusBalanceConsumption.getParamValue2());
                giftScore[2]= giftPayAmount.divide(scoreSetting2).intValue();
                if(scoreSetting2.compareTo(BigDecimal.ZERO)>0) {
                    giftScore[2] = giftPayAmount.divide(scoreSetting2).intValue();
                }
            }
        }