202107016

xiaoyong931011

2021-07-16 d5934d6253fd5029bf06fb26611dad47d0c0cb0b

202107016

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

@@ -305,6 +305,9 @@
        if(CollUtil.isNotEmpty(orderItemsVos)){
            for(OrderItemsVo orderItemsVo : orderItemsVos){
                if(ObjectUtil.isNotEmpty(orderItemsVo)){
                    String nickname = orderItemsVo.getNickname();
                    String decode = StringUtils.decode(nickname);
                    orderItemsVo.setNickname(decode);
                    Long orderId = orderItemsVo.getOrderId();
                    List<JhyOrderItems> jhyOrderItems = accountMapper.selectOrderById(orderId);
                    if(CollUtil.isNotEmpty(jhyOrderItems)){

 gc-user/src/main/java/com/xzx/gc/user/vo/OrderItemsVo.java

@@ -17,6 +17,12 @@
    @ApiModelProperty(value="订单编号")
    private String orderNo;

    @ApiModelProperty(value="团员名字")
    private String nickname;

    @ApiModelProperty(value="手机号")
    private String phone;

    @ApiModelProperty(value="回收品类")
    private List<JhyOrderItems> OrderItems;


 gc-user/src/main/resources/mapper/user/AccountMapper.xml

@@ -252,11 +252,14 @@
            a.order_no orderNo,
            a.score scoreReward,
            a.amount amountReward,
            a.nick_name nickname,
            a.mobile_phone phone,
            (select sum(score) from xzx_jhy_order_items where b.id = order_id) score,
            (select sum(score/ 40) from xzx_jhy_order_items where b.id = order_id) amount
        FROM
            xzx_user_head_details a
                LEFT JOIN xzx_jhy_order b ON a.order_no = b.order_no
                LEFT JOIN xzx_user_info c on a.user_id = c.user_id
        WHERE
            a.head_user_id = #{userId}
    </select>