Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-12 baa79615425b71521e67ec8a9344b88ce53fc5de

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

@@ -89,7 +89,7 @@
    private ShopSalesmanGradeDao shopSalesmanGradeDao;

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

        //判断是否存在需要同步的产品，只有绑定了erp中产品的才同步
        boolean needTb=false;
@@ -127,7 +127,7 @@
            order.setTotal(orderDto.getOrderMoney().doubleValue());
            order.setZkTotal(orderDto.getOrderMoney().doubleValue());
            order.setPayTime(new Date());
            order.setArrears(0);
            order.setArrears(0D);
            int i = sysOrderDao.insert(order);
            // 创建订单明细,并计算总价与折扣总价
            int count = 0;