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

jyy

2021-03-17 0c60f5608fc8f738eb138e32f583c329ed5aa81d

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

@@ -7,6 +7,7 @@
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.fenxiao.dao.ShopRevenueFlowDao;
import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
import com.matrix.system.fenxiao.dao.ShopSalesmanOrderDao;
import com.matrix.system.fenxiao.entity.ShopSalesmanGrade;
@@ -84,6 +85,7 @@
    private ShopSalesmanGradeDao shopSalesmanGradeDao;



    @Override
    public void handle(String consumerTag, Delivery message) throws IOException {

@@ -93,6 +95,7 @@
        ShopOrder order = shopOrderDao.selectById(Integer.valueOf(orderId));
        //获取订单详情
        List<ShopOrderDetails> orderDetails = shopOrderDetailsDao.selectByOrderId(Integer.valueOf(orderId));
        order.setDetails(orderDetails);
        //处理分销订单
        handleExtensionOrder(order);

@@ -175,6 +178,8 @@
                    invitationAmount=invitationAmount*zk;
                    invitationOrder.setAmount(invitationAmount);
                    shopSalesmanOrderDao.insert(invitationOrder);


                }
            }
        }else{