Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-12 ff517178453b21a9bb084c1ed39def9f7e4f45f3

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

@@ -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;
@@ -284,7 +284,7 @@
                    ||item.getShopSku().getSealesPrice().doubleValue()==0){
                        //按分销等级计算
                        BizUser salesMan=bizUserService.findByOpenId(bizUser.getParentOpenId());
                        shopSalesmanGradeDao.selectById(salesMan.getSalesmanGrade())
                        shopSalesmanGradeDao.selectById(salesMan.getSalesmanGrade());

                    }else{
                        //按产品设置的金额计算