xiaoyong931011
2021-07-14 8d08ca6bdfc3dd61b0aaa7daa27308c3d59f0df1
202107014
1 files added
6 files modified
204 ■■■■■ changed files
gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java 48 ●●●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/dto/UpdateSettingDto.java 31 ●●●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java 2 ●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/mapper/RedPaperRuleMapper.java 2 ●●●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java 93 ●●●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java 24 ●●●● patch | view | raw | blame | history
gc-user/src/main/resources/mapper/user/RedPaperRuleMapper.xml 4 ●●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
@@ -1,9 +1,19 @@
package com.xzx.gc.user.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.xzx.gc.common.Result;
import com.xzx.gc.common.constant.CommonEnum;
import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.dto.log.OperationAppLog;
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.entity.JhyInfo;
import com.xzx.gc.entity.RedPaperRule;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.user.dto.ExamineJwyDto;
import com.xzx.gc.user.dto.UpdateSettingDto;
import com.xzx.gc.user.dto.ViewSettingDto;
import com.xzx.gc.user.mapper.RedPaperRuleMapper;
import com.xzx.gc.user.service.DistribService;
import com.xzx.gc.user.vo.ViewSettingVo;
import io.swagger.annotations.Api;
@@ -15,12 +25,18 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@RestController
@Api(tags = {"分銷系統管理"})
public class AdminDistribController extends BaseController {
    @Autowired
    @Resource
    private DistribService distribService;
    @Resource
    private RedPaperRuleMapper redPaperRuleMapper;
    /**
     * 查看分銷系統设置详情
@@ -29,10 +45,36 @@
    @ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewSettingVo.class)})
    @ApiOperation(value="分銷系統管理-查看分銷系統设置详情", notes="test: 仅0有正确返回")
    public JsonResult<ViewSettingVo> viewSetting(@RequestBody ViewSettingDto viewSettingDto) {
        Long id = viewSettingDto.getId();
        ViewSettingVo viewSettingVo = distribService.viewSetting(id);
        ViewSettingVo viewSettingVo = distribService.viewSetting("分销规则");
        return JsonResult.success(viewSettingVo);
    }
    /**
     * 更新分銷系統设置
     */
    @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/jhy/updateSetting.json")
    @ApiOperation(value="分銷系統管理--更新分銷系統设置", notes="test: 仅0有正确返回")
    public JsonResult updateSetting(@RequestBody UpdateSettingDto model, HttpServletRequest request) {
        RedPaperRule redPaperRule = redPaperRuleMapper.selectByRuleName("分销规则");
        if(ObjectUtil.isEmpty(redPaperRule)){
            distribService.addSetting(model);
            OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                    .methodName(Constants.USER_MODUL_NAME).operateAction("分銷系統管理--新增分銷系統设置").build();
            mqUtil.sendApp(build);
        }else{
            Integer id = model.getId();
            if(redPaperRule.getId() != id){
                return JsonResult.failMessage("规则不存在!");
            }
            distribService.updateSetting(model);
            OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                    .methodName(Constants.USER_MODUL_NAME).operateAction("分銷系統管理--更新分銷系統设置-" + model.getId()).build();
            mqUtil.sendApp(build);
        }
        return  JsonResult.success("操作成功!");
    }
}
gc-user/src/main/java/com/xzx/gc/user/dto/UpdateSettingDto.java
New file
@@ -0,0 +1,31 @@
package com.xzx.gc.user.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class UpdateSettingDto {
    @ApiModelProperty(value = "Id,没有可以不传")
    private Integer id;
    //首单奖励(FristReward)元
    @ApiModelProperty(value = "首单奖励(FristReward)元")
    private BigDecimal fristReward;
    //团员在完成首单后,(orderNumFrist)笔单内,可以固定积分(regularPoint)+环保币(regularMoneyPercent)方式进行返佣团长
    @ApiModelProperty(value = "团员在完成首单后,(orderNumFrist)笔单内,可以固定积分(regularPoint)+环保币(regularMoneyPercent)方式进行返佣团长")
    private Integer orderNumFrist;
    private Integer regularPoint;
    private BigDecimal regularMoneyPercent;
    //团员完成(FinishOrderNum)单后,团员每完成一单团长获得(pointReward)积分:
    @ApiModelProperty(value = "团员完成(FinishOrderNum)单后,团员每完成一单团长获得(pointReward)积分:")
    private Integer finishOrderNum;
    private Integer pointReward;
    @ApiModelProperty("0:不启用,1:启用")
    private Short status;
}
gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java
@@ -1,9 +1,9 @@
package com.xzx.gc.user.dto;
import com.xzx.gc.annotation.Query;
import lombok.Data;
@Data
public class ViewSettingDto {
    private Long id;
}
gc-user/src/main/java/com/xzx/gc/user/mapper/RedPaperRuleMapper.java
@@ -7,4 +7,6 @@
public interface RedPaperRuleMapper extends GcMapper<RedPaperRule> {
    RedPaperRule getOne(@Param("now") String now, @Param("ruleType") String ruleType, @Param("partnerId") String partnerId);
    RedPaperRule selectByRuleName(@Param("ruleStr")String ruleStr);
}
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -1,16 +1,107 @@
package com.xzx.gc.user.service;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.xzx.gc.entity.RedPaperRule;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.user.dto.UpdateSettingDto;
import com.xzx.gc.user.mapper.RedPaperRuleMapper;
import com.xzx.gc.user.vo.ViewSettingVo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
@Service
@Transactional
public class DistribService {
    @Resource
    private RedPaperRuleMapper redPaperRuleMapper;
    public ViewSettingVo viewSetting(Long id) {
    public ViewSettingVo viewSetting(String ruleStr) {
        ViewSettingVo viewSettingVo = new ViewSettingVo();
        RedPaperRule redPaperRule = redPaperRuleMapper.selectByRuleName(ruleStr);
        if(ObjectUtil.isEmpty(redPaperRule)){
            viewSettingVo.setFristReward(BigDecimal.ZERO);
            viewSettingVo.setOrderNumFrist(0);
            viewSettingVo.setRegularPoint(0);
            viewSettingVo.setRegularMoneyPercent(BigDecimal.ZERO);
            viewSettingVo.setFinishOrderNum(0);
            viewSettingVo.setPointReward(0);
            viewSettingVo.setStatus((short) 0);
        }else{
            String shareRatio = redPaperRule.getShareRatio();
            if(StrUtil.isNotEmpty(shareRatio)){
                List<String> shareRatios = StrUtil.split(shareRatio,',',false,false);
                if(ObjectUtil.isNotEmpty(shareRatios)){
                    viewSettingVo.setId(redPaperRule.getId());
                    viewSettingVo.setFristReward(StrUtil.isEmpty(shareRatios.get(0))?BigDecimal.ZERO:new BigDecimal(shareRatios.get(0)));
                    viewSettingVo.setOrderNumFrist(StrUtil.isEmpty(shareRatios.get(1))?0:Integer.parseInt(shareRatios.get(1)));
                    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.setStatus(redPaperRule.getStatus());
                }
            }else{
                viewSettingVo.setId(redPaperRule.getId());
                viewSettingVo.setFristReward(BigDecimal.ZERO);
                viewSettingVo.setOrderNumFrist(0);
                viewSettingVo.setRegularPoint(0);
                viewSettingVo.setRegularMoneyPercent(BigDecimal.ZERO);
                viewSettingVo.setFinishOrderNum(0);
                viewSettingVo.setPointReward(0);
                viewSettingVo.setStatus((short) 0);
            }
        }
        return viewSettingVo;
    }
    public void addSetting(UpdateSettingDto model) {
        RedPaperRule redPaperRule = new RedPaperRule();
        StringBuffer stringBuffer = new StringBuffer();
        BigDecimal fristReward = ObjectUtil.isEmpty(model.getFristReward()) ? BigDecimal.ZERO : model.getFristReward();
        stringBuffer.append(fristReward+",");
        int orderNumFrist = ObjectUtil.isEmpty(model.getOrderNumFrist()) ? 0 : model.getOrderNumFrist();
        stringBuffer.append(orderNumFrist+",");
        int regularPoint = ObjectUtil.isEmpty(model.getRegularPoint()) ? 0 : model.getRegularPoint();
        stringBuffer.append(regularPoint+",");
        BigDecimal regularMoneyPercent = ObjectUtil.isEmpty(model.getRegularMoneyPercent()) ? BigDecimal.ZERO : model.getRegularMoneyPercent();
        stringBuffer.append(regularMoneyPercent+",");
        int finishOrderNum = ObjectUtil.isEmpty(model.getFinishOrderNum()) ? 0 : model.getFinishOrderNum();
        stringBuffer.append(finishOrderNum+",");
        int pointReward = ObjectUtil.isEmpty(model.getPointReward()) ? 0 : model.getPointReward();
        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.setShareRatio(stringBuffer.toString());
        redPaperRuleMapper.insert(redPaperRule);
    }
    public void updateSetting(UpdateSettingDto model) {
        RedPaperRule redPaperRule = redPaperRuleMapper.selectByPrimaryKey(model.getId());
        if(ObjectUtil.isNotEmpty(redPaperRule)){
            StringBuffer stringBuffer = new StringBuffer();
            BigDecimal fristReward = ObjectUtil.isEmpty(model.getFristReward()) ? BigDecimal.ZERO : model.getFristReward();
            stringBuffer.append(fristReward+",");
            int orderNumFrist = ObjectUtil.isEmpty(model.getOrderNumFrist()) ? 0 : model.getOrderNumFrist();
            stringBuffer.append(orderNumFrist+",");
            int regularPoint = ObjectUtil.isEmpty(model.getRegularPoint()) ? 0 : model.getRegularPoint();
            stringBuffer.append(regularPoint+",");
            BigDecimal regularMoneyPercent = ObjectUtil.isEmpty(model.getRegularMoneyPercent()) ? BigDecimal.ZERO : model.getRegularMoneyPercent();
            stringBuffer.append(regularMoneyPercent+",");
            int finishOrderNum = ObjectUtil.isEmpty(model.getFinishOrderNum()) ? 0 : model.getFinishOrderNum();
            stringBuffer.append(finishOrderNum+",");
            int pointReward = ObjectUtil.isEmpty(model.getPointReward()) ? 0 : model.getPointReward();
            stringBuffer.append(pointReward);
            redPaperRule.setStatus(model.getStatus());
            redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,finish_order_num,point_reward");
            redPaperRule.setShareRatio(stringBuffer.toString());
            redPaperRuleMapper.updateByPrimaryKey(redPaperRule);
        }
    }
}
gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java
@@ -1,6 +1,7 @@
package com.xzx.gc.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -9,9 +10,24 @@
@ApiModel(value = "ViewSettingVo", description = "后台分销系统设置接口返回参数类")
public class ViewSettingVo {
    //首单奖励
    private BigDecimal FristReward;
    private Integer id;
    //团员在完成首单后,(请输入订单数量)笔单内,可以固定积分+环保币方式进行返佣团长
    private Integer orderNum;
    //首单奖励(FristReward)元
    @ApiModelProperty(value = "首单奖励(FristReward)元")
    private BigDecimal fristReward;
    //团员在完成首单后,(orderNumFrist)笔单内,可以固定积分(regularPoint)+环保币(regularMoneyPercent)方式进行返佣团长
    @ApiModelProperty(value = "团员在完成首单后,(orderNumFrist)笔单内,可以固定积分(regularPoint)+环保币(regularMoneyPercent)方式进行返佣团长")
    private Integer orderNumFrist;
    private Integer regularPoint;
    private BigDecimal regularMoneyPercent;
    //团员完成(FinishOrderNum)单后,团员每完成一单团长获得(pointReward)积分:
    @ApiModelProperty(value = "团员完成(FinishOrderNum)单后,团员每完成一单团长获得(pointReward)积分:")
    private Integer finishOrderNum;
    private Integer pointReward;
    @ApiModelProperty("开关0:已经关闭,1:正常")
    private Short status;
}
gc-user/src/main/resources/mapper/user/RedPaperRuleMapper.xml
@@ -17,4 +17,8 @@
        </if>
        limit  1
    </select>
  <select id="selectByRuleName" resultType="com.xzx.gc.entity.RedPaperRule">
    select * from xzx_user_redpaper_rule where rule_name = #{ruleStr}
  </select>
</mapper>