Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-02 280c1bf9b93fb57b65d2c3f88cc4924aa9d780b4

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

@@ -155,7 +155,12 @@
            throw new RestException(-3, "无权限操作");
        }

        order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
        if (userId.equals(order.getJhyId())) {
            order.setStatus(JhyOrder.ORDER_STATUS_WAITING);
        } else {
            order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
        }

        jhyOrderMapper.updateByPrimaryKey(order);
    }

@@ -168,9 +173,10 @@
        BigDecimal totalScore = BigDecimal.ZERO;
        for (JhyOrderConfirmItemsDto item : confirmDto.getItems()) {
            JhyOrderItems orderItem = jhyOrderItemsMapper.selectByPrimaryKey(item.getId());
            BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(new BigDecimal(item.getWeight()));
            BigDecimal weight = StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO;
            BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(weight);
            orderItem.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
            orderItem.setWeight(StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO);
            orderItem.setWeight(weight);
            jhyOrderItemsMapper.updateByPrimaryKey(orderItem);

            totalScore = totalScore.add(total);
@@ -192,20 +198,29 @@
        jhyScoreDetail.setOrderNo(order.getOrderNo());
        jhyScoreDetail.setUserId(order.getJhyId());
        jhyScoreDetail.setType(ScoreDetails.SCORE_TYPE_PAY);
        jhyScoreDetail.setChangeScore(totalScore.negate());
        jhyScoreDetail.setOriginalScore(jhyScore);
        jhyScoreDetail.setCurrentScore(jhyScore.subtract(totalScore));
        jhyScoreDetail.setChangeScore(totalScore.negate().setScale( 0, BigDecimal.ROUND_DOWN ));
        jhyScoreDetail.setOriginalScore(jhyScore.setScale( 0, BigDecimal.ROUND_DOWN ));
        jhyScoreDetail.setCurrentScore(jhyScore.subtract(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ));
        jhyScoreDetail.setCreatedTime(new Date());
        scoreDetailsMapper.insert(jhyScoreDetail);

        jhyAccount.setCollectScore(jhyScore.subtract(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
        accountMapper.updateByPrimaryKey(jhyAccount);

        AccountInfo userAccount = accountMapper.selectAccountInfoByUserId(order.getUserId());
        BigDecimal userScore = StrUtil.isBlank(userAccount.getCollectScore()) ? BigDecimal.ZERO : new BigDecimal(userAccount.getCollectScore());
        ScoreDetails userScoreDetail = new ScoreDetails();
        userScoreDetail.setOrderNo(order.getOrderNo());
        userScoreDetail.setUserId(order.getJhyId());
//        userScoreDetail.setUserId(order.getJhyId());
        userScoreDetail.setUserId(order.getUserId());
        userScoreDetail.setType(ScoreDetails.SCORE_TYPE_EXCHANGE);
        userScoreDetail.setChangeScore(totalScore);
        userScoreDetail.setOriginalScore(userScore);
        userScoreDetail.setCurrentScore(userScore.add(totalScore));
        userScoreDetail.setChangeScore(totalScore.setScale( 0, BigDecimal.ROUND_DOWN ));
        userScoreDetail.setOriginalScore(userScore.setScale( 0, BigDecimal.ROUND_DOWN ));
        userScoreDetail.setCurrentScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ));
        userScoreDetail.setCreatedTime(new Date());
        scoreDetailsMapper.insert(userScoreDetail);

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