fix 50 to 40

Helius

2022-02-21 f54f8a92c09a2cd76b3bbb796df680215b63ab8a

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

@@ -23,8 +23,10 @@
import com.xzx.gc.model.user.*;
import com.xzx.gc.user.dto.AddressDto;
import com.xzx.gc.user.dto.RayaltyDto;
import com.xzx.gc.user.dto.TgmxInfoListDto;
import com.xzx.gc.user.mapper.*;
import com.xzx.gc.user.vo.CategaryVo;
import com.xzx.gc.user.vo.TgmxInfoListVo;
import com.xzx.gc.user.vo.UserIdentityVo;
import com.xzx.gc.util.DoubleUtil;
import lombok.extern.slf4j.Slf4j;
@@ -443,6 +445,12 @@
                    mx.setCollectScore(new BigDecimal(collectScore).setScale( 2, BigDecimal.ROUND_DOWN ));
                }

                String mobilePhone = mx.getMobilePhone();
                if(StrUtil.isNotEmpty(mobilePhone)){
                    String tgrPhone = orderMapper.selectTGRMobileByPhone(mobilePhone);
                    mx.setTgrPhone(StrUtil.isEmpty(tgrPhone) ? "-" : tgrPhone);
                }

            }

            //设置登录时间
@@ -461,9 +469,11 @@
                mx.setNickName(com.xzx.gc.common.utils.StringUtils.decode(mx.getNickName()));
            }
            // 待完成订单总数
            Map<String, Object> osMap = orderMapper.queryCuserOrderByUserIdCount1(mx.getUserId());
            mx.setOrderStatus3(Integer.parseInt(osMap.get("count1").toString()));
            mx.setOrderStatus5(Integer.parseInt(osMap.get("count").toString()));
//            Map<String, Object> osMap = orderMapper.queryCuserOrderByUserIdCount1(mx.getUserId());
            Map<String, Object> orderIng = orderMapper.queryCuserOrderByUserIdOrderIng(mx.getUserId());
            Map<String, Object> orderDone = orderMapper.queryCuserOrderByUserIdOrderDone(mx.getUserId());
            mx.setOrderStatus3(Integer.parseInt(orderIng.get("count").toString()));
            mx.setOrderStatus5(Integer.parseInt(orderDone.get("count").toString()));

            //查询用户首次下单时间和最近下单时间
            List<OrderInfo> byCreateUserId = orderService.findByCreateUserId(mx.getUserId(), null);
@@ -898,4 +908,15 @@
        userMapper.insertSelective(userInfo);
    }

    public Map<String, Object> tgmxInfo(TgmxInfoListDto model) {
        PageHelper.startPage(model.getPage(), model.getLimit());
        List<TgmxInfoListVo> maps = userMapper.tgmxInfo(model);
        PageInfo pageInfo = new PageInfo(maps);
        int count = Convert.toInt(pageInfo.getTotal());
        Map<String, Object> map = new HashMap<>();
        map.put("data", maps);
        map.put("count", count);
        map.put("code", 0);
        return map;
    }
}