modify

wzy

2021-01-18 8f7c1defee488bb6f5e5f30ad5ac13ea0c77e71a

modify

 zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java

@@ -9,9 +9,7 @@
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.SysOrderDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.ShoppingGoodsService;
import com.matrix.system.hive.service.SysOrderService;
@@ -24,6 +22,7 @@
import com.rabbitmq.client.DeliverCallback;
import com.rabbitmq.client.Delivery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.io.IOException;
@@ -34,6 +33,7 @@
/**
 * 微商城订单同步到erp系统
 */
@Component
public class OrderTask implements DeliverCallback {


@@ -73,6 +73,12 @@
    @Autowired
    BusParameterSettingsDao parameterSettingsDao;

    @Autowired
    private SysOrderFlowDao sysOrderFlowDao;

    @Autowired
    private ShoppingGoodsDao shoppingGoodsDao;

    @Transactional(rollbackFor = Exception.class)
    public void createOrder(ShopOrder orderDto) {

@@ -86,7 +92,7 @@
        }

        //获取订单归属门店
        order.setCompanyId(bizUser.getCompanyId());
        order.setCompanyId(vipInfo.getCompanyId());
        order.setShopId(Long.parseLong(orderDto.getStoreId()+""));
        //同步的订单订单编号保持一致
        order.setOrderNo(orderDto.getOrderNo());
@@ -100,6 +106,7 @@
        order.setCashPay(orderDto.getOrderMoney().doubleValue());
        order.setTotal(orderDto.getOrderMoney().doubleValue());
        order.setZkTotal(orderDto.getOrderMoney().doubleValue());
        order.setPayTime(new Date());
        order.setArrears(0);
        int i = sysOrderDao.insert(order);
        // 创建订单明细,并计算总价与折扣总价
@@ -188,13 +195,21 @@
        orderService.setShopSelCount(sourceOrder);

        SysOrderFlow flow = new SysOrderFlow();
        flow.setFlowNo(codeService.getFlowCode() + "-" + i);
        Long goodsId = sourceOrder.getItems().get(0).getGoodsId();
        ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);
        flow.setFlowContent(goods.getName() + "等" + sourceOrder.getItems().size() + "件产品");

        flow.setOrderId(sourceOrder.getId());
        flow.setVipId(sourceOrder.getVipId());
        flow.setFlowType(SysOrderFlow.FLOW_TYPE_BUY);

        flow.setAmount(orderDto.getOrderMoney());
        flow.setPayMethod("微信");

        List<SysOrderFlow> flows = new ArrayList<>();
        flows.add(flow);
        sourceOrder.setFlows(flows);
        orderService.updateAfterMoney(sourceOrder);
        flow.setShopId(sourceOrder.getShopId());
        flow.setCompanyId(sourceOrder.getCompanyId());
        sysOrderFlowDao.insert(flow);

    }