修改业绩

935090232@qq.com

2021-03-04 a7f47c8953b2055e7971df01b1aad3b40b128b17

修改业绩

 zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java

@@ -21,6 +21,8 @@
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
import com.matrix.system.hive.service.*;
import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -128,9 +130,9 @@
        orderService.updateReceiptMoney(sysOrder);

        //发送微信公众号提醒
//        UniformMsgParam uniformMsgParam=new UniformMsgParam(user.getCompanyId(),UniformMsgParam.GZH_GMCG);
//        uniformMsgParam.put("orderId",sysOrder.getId());
//        rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,uniformMsgParam.toJSONString());
        UniformMsgParam uniformMsgParam=new UniformMsgParam(user.getCompanyId(),UniformMsgParam.GZH_GMCG);
        uniformMsgParam.put("orderId",sysOrder.getId());
        rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,uniformMsgParam.toJSONString());


        //处理用户购买的产品

 zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java

@@ -101,6 +101,7 @@
    /**
     * 现金单次，购买项目的业绩
     */
    @Deprecated
    private Double  projCash;
            
    
@@ -167,11 +168,13 @@


    /**
     * 业绩种类 1-现金业绩 2-划扣业绩
     * 岗位业绩
     */
    private String  t3;
			
	

    /**
     * 业绩类型
     */
    private String  t4;
            
    
@@ -254,7 +257,6 @@
    /**
     * 分配的业绩金额
     */
    @Extend
    private Double achieveMoney;

    private String goodsNo;

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

@@ -256,14 +256,6 @@
        achieveNew.setShoppingGoodsId(orderItem.getGoodsId());
        // 是否赠送
        achieveNew.setT2(orderItem.getIsFree());
        // 根据商品类型设置业绩类型

        if (Dictionary.ACHIEVE_TYPE_CASH.equals(achieveNew.getT3())){
            achieveNew.setCardCash(Double.parseDouble(achieveNew.getT1()));
        } else {
            // 设置划扣金额
            achieveNew.setConsume(Double.parseDouble(achieveNew.getT1()));
        }
    }

    @Override

 zq-erp/src/main/resources/config/db/increment/美度业绩升级.sql

New file
@@ -0,0 +1,3 @@
ALTER TABLE `achieve_new`
DROP COLUMN `achieveMoney`,
ADD COLUMN `achieveMoney` double(10, 0) NULL AFTER `company_id`;

 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml

@@ -28,6 +28,7 @@
        <result property="remark" column="remark" />
        <result property="orderType" column="order_type" />
        <result property="projPercentage" column="proj_percentage" />
        <result property="achieveMoney" column="achieveMoney" />
        <result property="t1" column="t1" />
        <result property="t2" column="t2" />
        <result property="t3" column="t3" />
@@ -76,6 +77,7 @@
        a.consume,
        a.his_consume,
        a.free_consume,
        a.achieveMoney,
        f.su_name meiliao,
        g.su_name guwen,
        a.proj_percentage,
@@ -298,6 +300,7 @@
        <result property="remark" column="remark" />
        <result property="orderType" column="order_type" />
        <result property="projPercentage" column="proj_percentage" />
        <result property="achieveMoney" column="achieveMoney" />
        <result property="t1" column="t1" />
        <result property="t2" column="t2" />
        <result property="t3" column="t3" />
@@ -334,6 +337,7 @@
        remark,
        order_type,
        proj_percentage,
        achieveMoney,
        t1,
        t2,
        t3,
@@ -370,6 +374,7 @@
        #{item.remark},
        #{item.orderType},
        #{item.projPercentage},
        #{item.achieveMoney},
        #{item.t1},
        #{item.t2},
        #{item.t3},
@@ -617,6 +622,9 @@
            <if test="_parameter.containsKey('projPercentage')">
                proj_percentage = #{projPercentage},
            </if>
            <if test="_parameter.containsKey('achieveMoney')">
                achieveMoney = #{achieveMoney},
            </if>
            <if test="_parameter.containsKey('t1')">
                t1 = #{t1},
            </if>
@@ -736,6 +744,9 @@
            <if test="record.projPercentage != null ">
                proj_percentage = #{record.projPercentage},
            </if>
            <if test="record.achieveMoney != null ">
                achieveMoney = #{record.achieveMoney},
            </if>
            <if test="record.t1 != null and record.t1 != '' ">
                t1 = #{record.t1},
            </if>

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -1017,8 +1017,6 @@
                                let achieveNew = {
                                    uuid:item.uuid,
                                    beaultId: achieve.saleId,
                                    t1: achieve.achieveMoney,
                                    t3: achieve.t3,
                                    projPercentage: achieve.commission,
                                };