分销设置自购返佣

xiaoyong931011

2021-03-24 1ca30318231615ca0a4f2322f1c851f04fefeb73

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

@@ -128,7 +128,6 @@
            salesmanOrder.setUpdateTime(new Date());
            salesmanOrder.setOrderId(Long.parseLong(order.getId()+""));
            salesmanOrder.setUserId(order.getUserId());
            salesmanOrder.setSalesUserId(bizUser.getParentOpenId());
            salesmanOrder.setRevenueType(ShopSalesmanOrder.REVENUE_TYPE_SALES);
            salesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_DJS);
           Double selfAmount=0D;
@@ -143,8 +142,7 @@
            }
            //自购返佣
            for (ShopOrderDetails item:order.getDetails() ){
                if(StringUtils.isNotBlank(item.getShopProduct().getAttrValues())
                        && item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
                if(item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
                    //分销规则是否开启自购返佣
                    BusParameterSettings zgfy = parameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_ZGFY, bizUser.getCompanyId());
                    //按分销等级计算
@@ -170,6 +168,7 @@
                zk=order.getOrderMoney().doubleValue()/orderTotal;
                selfAmount=selfAmount*zk;
                salesmanOrder.setAmount(selfAmount);
                salesmanOrder.setSalesUserId(order.getUserId());
                shopSalesmanOrderDao.insert(salesmanOrder);
            }
            //存在上级
@@ -190,8 +189,7 @@
               }
               //收益计算
                for (ShopOrderDetails item:order.getDetails() ){
                    if(StringUtils.isNotBlank(item.getShopProduct().getAttrValues())
                            && item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
                    if(item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
                        //按分销等级计算
                        ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(salesMan.getSalesmanGrade());
                        //推广提成，按分销等级计算或者按产品设置的推广金额计算
@@ -221,6 +219,7 @@
                    zk=order.getOrderMoney().doubleValue()/orderTotal;
                    salesAmount=salesAmount*zk;
                    salesmanOrder.setAmount(salesAmount);
                    salesmanOrder.setSalesUserId(bizUser.getParentOpenId());
                    shopSalesmanOrderDao.insert(salesmanOrder);
                }
                //邀请提成记录