blame | history | patch | commit | commitdiff | ignore whitespace
Helius
2021-07-15 bea4cd8cceb220189fd1fed5c2c1ff22d3e8a9ed 
 gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java


@@ -78,7 +78,7 @@


                    viewSettingVo.setRegularPoint(StrUtil.isEmpty(shareRatios.get(2))?0:Integer.parseInt(shareRatios.get(2)));


                    viewSettingVo.setRegularMoneyPercent(StrUtil.isEmpty(shareRatios.get(3))?BigDecimal.ZERO:new BigDecimal(shareRatios.get(3)));


//                    viewSettingVo.setFinishOrderNum(StrUtil.isEmpty(shareRatios.get(4))?0:Integer.parseInt(shareRatios.get(4)));


                    viewSettingVo.setPointReward(StrUtil.isEmpty(shareRatios.get(5))?0:Integer.parseInt(shareRatios.get(5)));


                    viewSettingVo.setPointReward(StrUtil.isEmpty(shareRatios.get(4))?0:Integer.parseInt(shareRatios.get(4)));


                    viewSettingVo.setStatus(redPaperRule.getStatus());


                }


            }else{


@@ -177,7 +177,7 @@


        stringBuffer.append(pointReward);


        redPaperRule.setStatus((short) 0);


        redPaperRule.setRuleName("分销规则");


        redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,finish_order_num,point_reward");


        redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,point_reward");


        redPaperRule.setShareRatio(stringBuffer.toString());


        redPaperRuleMapper.insert(redPaperRule);


    }


@@ -199,7 +199,7 @@


            int pointReward = ObjectUtil.isEmpty(model.getPointReward()) ? 0 : model.getPointReward();


            stringBuffer.append(pointReward);


            redPaperRule.setStatus(model.getStatus());


            redPaperRule.setSharingProfitType("first_reward,order_num_first,regular_point,regular_money_percent,finish_order_num,point_reward");


            redPaperRule.setSharingProfitType("first_reward,order_num_first,regular_point,regular_money_percent,point_reward");


            redPaperRule.setShareRatio(stringBuffer.toString());


            redPaperRuleMapper.updateByPrimaryKey(redPaperRule);


        }