Merge branch 'api' into hive2.0

Helius

2021-01-28 f935e297274e5e75b5c16be62d14b000007ef832

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

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

import com.matrix.component.rabbitmq.RabiitMqTemplate;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
@@ -24,7 +25,10 @@
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;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
@@ -84,6 +88,10 @@
    @Autowired
    private SysOrderFlowService sysOrderFlowService;

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

    /**
     * 计算订单金额
@@ -121,6 +129,13 @@
        //校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
        sysOrder = orderService.checkAndSaveOrder(sysOrder);
        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());


        //处理用户购买的产品
        return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单结算成功");
    }
@@ -278,16 +293,7 @@
        MoneyCardUse cardUseInfo = cardUseService.findByVipId(order.getVipId());

        if (cardUseInfo == null) {
            cardUseInfo = new MoneyCardUse();
            cardUseInfo.setVipId(order.getVipId());
            cardUseInfo.setCardName("储值卡");
            cardUseInfo.setIsVipCar(Dictionary.FLAG_YES_Y);
            cardUseInfo.setRealMoney(0D);
            cardUseInfo.setGiftMoney(0D);
            cardUseInfo.setSource("-");
            cardUseInfo.setStatus(Dictionary.MONEYCARD_STATUS_YX);
            cardUseInfo.setFailTime(DateUtil.stringToDate("2050-01-01 00:00",DateUtil.DATE_FORMAT_MM));
            moneyCardUseDao.insert(cardUseInfo);
            cardUseInfo=sysVipInfoService.addVipDefaultCard(order.getVipId());
        }

        //打印需求加入门店信息