1、新增消息推送提醒 2、修改业绩计算bug

jyy

2021-01-26 ab2879bbcb846256cc182198b9c04e50fbc276c1

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

@@ -1,5 +1,6 @@
package com.matrix.system.hive.service.imp;

import com.matrix.component.rabbitmq.RabiitMqTemplate;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
@@ -27,8 +28,11 @@
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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -106,6 +110,13 @@

    @Autowired
    private SysInstoreInfoService sysInstoreInfoService;


    @Value("${evn}")
    private  String evn;

    @Autowired
    private RabiitMqTemplate rabiitMqTemplate;


    @Override
@@ -256,6 +267,12 @@

            order.setStatu(Dictionary.ORDER_STATU_YQX);
            order.setArrears(0D);

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

            return sysOrderDao.update(order);

        } else {
@@ -351,8 +368,11 @@
            achieveNewService.removeByModel(achieveNew);
            // 取消订单
            order.setStatu(Dictionary.ORDER_STATU_YQX);


            return sysOrderDao.update(order);
        }

    }