parent: bf9a238e | patch | commit | ignore whitespace
xiaoyong931011
2021-07-15 8c3a275e7542e6e1493d611d2914899bbfdeeef0 
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
5 files modified
20 ■■■■■ changed files
gc-core/src/main/resources/application-dev.properties 2 ●●●●● patch | view | raw | blame | history
gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java 9 ●●●●● patch | view | raw | blame | history
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java 2 ●●●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java 2 ●●●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java 5 ●●●●● patch | view | raw | blame | history 
 gc-core/src/main/resources/application-dev.properties


@@ -12,7 +12,7 @@


#spring.datasource.url=jdbc:mysql://192.168.0.100:3306/t_xzxhb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true&serverTimezone=Asia/Shanghai



#spring.datasource.username=root



#spring.datasource.password=admin!@#00



spring.datasource.url=jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true



spring.datasource.url=jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true&serverTimezone=GMT%2b8



spring.datasource.username=ct_test



spring.datasource.password=123456









 gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java


@@ -56,6 +56,7 @@




        Integer count = userHeadDetailsMapper.selectDetailsCount(userId);


        UserInfo userInfo = userMapper.selectByPrimaryKey(userId);


        AccountInfo accountInfo = accountMapper.selectAccountInfoByUserId(userId);


        List<String> remark = new ArrayList<>();


        BigDecimal totalReturnScore = BigDecimal.ZERO;


        BigDecimal totalReturnCoin = BigDecimal.ZERO;


@@ -124,13 +125,19 @@


        userHeadRelate.setScore(userHeadDetails.getScore().add(totalReturnScore));


        userHeadRelateMapper.updateByPrimaryKey(userHeadRelate);




        accountInfo.setAccountId(accountInfo.getAccountId());


        accountInfo.setMoney(new BigDecimal(accountInfo.getMoney()).add(totalReturnCoin).setScale(2, BigDecimal.ROUND_DOWN).toString());


        BigDecimal collectScore = StrUtil.isNotBlank(accountInfo.getCollectScore()) ? new BigDecimal(accountInfo.getCollectScore()) : BigDecimal.ZERO;


        accountInfo.setCollectScore(collectScore.add(totalReturnScore).setScale(2, BigDecimal.ROUND_DOWN).toString());


        accountMapper.updateByPrimaryKey(accountInfo);




        SysMessage sysMessage = new SysMessage();


        sysMessage.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));


        sysMessage.setCreateUserId(userHeadRelate.getHeadUserId());


        sysMessage.setUserId(userHeadRelate.getHeadUserId());


        sysMessage.setMessageType("4");


        sysMessage.setMessageSubTypeName("返利消息");


        sysMessage.setMessage("收到用户:" + Base64.decodeStr(userInfo.getNickName()) + "的订单返利, 积分:" + totalReturnScore +", 环保币:" + totalReturnCoin);


        sysMessage.setMessage("收到用户:" + userInfo.getMobilePhone().replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2") + "的订单返利, 积分:" + totalReturnScore +", 环保币:" + totalReturnCoin);


        sysMessage.setFlag("2");


        sysMessageMapper.insert(sysMessage);


    }




 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java


@@ -234,6 +234,6 @@


        userAccount.setCollectScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());


        accountMapper.updateByPrimaryKey(userAccount);




        distribService.distribRecord(order.getId(), confirmDto.getUserId());


        distribService.distribRecord(order.getId(), order.getUserId());


    }


}




 gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java


@@ -36,7 +36,7 @@




    @ApiOperation("加入团队")


    @PostMapping(value = "/distrib/join")


    public JsonResult<String> join(DistribJoinDto distribJoinDto, HttpServletRequest request) {


    public JsonResult<String> join(@RequestBody DistribJoinDto distribJoinDto, HttpServletRequest request) {


        distribService.join(distribJoinDto.getHeadId(), getUserId(request));


        return JsonResult.success();


    }




 gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java


@@ -23,6 +23,7 @@


import cn.hutool.core.util.StrUtil;


import com.xzx.gc.model.JsonResult;


import com.xzx.gc.user.mapper.RedPaperRuleMapper;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


@@ -37,6 +38,7 @@


import java.util.List;


import java.util.Map;




@Slf4j


@Service


@Transactional


public class DistribService {


@@ -95,6 +97,7 @@






    public void join(String headId, String userId) {


        log.info("#加入团队:{}, {}#", headId, userId);


        AccountInfo headInfo = accountMapper.selectOneByUserId(headId);


        if (AccountInfo.IS_HEAD_N.equals(headInfo.getIsHead())) {


            throw new RestException(-3, "不是团长");


@@ -130,7 +133,7 @@


        sysMessage.setMobilePhone(accountInfo.getAccountName());


        sysMessage.setMessageType("4");


        sysMessage.setMessageSubTypeName("团队消息");


        sysMessage.setMessage("手机号:" + accountInfo.getAccountName() + "的用户, 成功加入您的团队");


        sysMessage.setMessage("手机号:" + accountInfo.getAccountName().replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2") + "的用户, 成功加入您的团队");


        sysMessage.setFlag("2");


        sysMessageMapper.insert(sysMessage);


    }