fix

Helius

2021-08-09 97f820efec913de380f6b723e1d1e410ac2fd76a

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

@@ -24,6 +24,8 @@
import com.xzx.gc.user.dto.AddressDto;
import com.xzx.gc.user.dto.RayaltyDto;
import com.xzx.gc.user.mapper.*;
import com.xzx.gc.user.vo.CategaryVo;
import com.xzx.gc.user.vo.UserIdentityVo;
import com.xzx.gc.util.DoubleUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Base64;
@@ -106,6 +108,15 @@
        userInfo.setDelFlag(Constants.DEL_NOT_FLAG);
        List<UserInfo> userInfo1 = userMapper.select(userInfo);
        return userInfo1;
    }

    public UserIdentityVo userIdentity(String userId) {
        AccountInfo accountInfo = accountService.findByUserIdForbidden(userId);

        UserIdentityVo userIdentityVo = new UserIdentityVo();
        userIdentityVo.setIsHead(accountInfo.getIsHead());

        return userIdentityVo;
    }


@@ -400,6 +411,7 @@
        orderStatus1.add("3");
        orderStatus2.add("4");
        orderStatus2.add("5");

        orderStatus2.add("7");
        for (UserModel mx : map) {

@@ -407,11 +419,11 @@
            if (userModel.getExportFlag() == 0) {
                //订单数
                Integer orderNum = 0;
                Example exampleOrder = new Example(OrderInfo.class);
                Example.Criteria criteriaOrder = exampleOrder.createCriteria();
                criteriaOrder.andEqualTo("userId",mx.getUserId());
                criteriaOrder.andNotEqualTo("orderStatus",6);
                List<OrderInfo> orderInfos = orderMapper.selectByExample(exampleOrder);
//                Example exampleOrder = new Example(OrderInfo.class);
//                Example.Criteria criteriaOrder = exampleOrder.createCriteria();
//                criteriaOrder.andEqualTo("userId",mx.getUserId());
//                criteriaOrder.andNotEqualTo("orderStatus",6);
                List<OrderInfo> orderInfos = orderMapper.selectOrderByUserId(mx.getUserId(),6);
                if(CollUtil.isNotEmpty(orderInfos)){
                    orderNum = orderNum + orderInfos.size();
                }
@@ -854,15 +866,25 @@
//            map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
//            map.put("orderid", map.get("orderId").toString());
//            map.put("createtime", map.get("createTime").toString());
            map.put("orderid", map.get("orderId").toString());
            map.put("address", map.get("address").toString());
            map.put("orderid", String.valueOf(map.get("orderId")));
            map.put("address", String.valueOf(map.get("address")));
            map.put("status", map.get("status"));
            map.put("type", map.get("type"));
            map.put("money", DoubleUtil.roundTwo(map.get("money").toString()));
            map.put("score", DoubleUtil.roundTwo(map.get("score").toString()));
            map.put("weight", DoubleUtil.roundThree(map.get("weight").toString()));
            map.put("name", map.get("name").toString());
            map.put("createtime", map.get("createTime").toString());
            map.put("money", DoubleUtil.roundTwo(String.valueOf(map.get("money"))));
            map.put("score", DoubleUtil.roundTwo(String.valueOf(map.get("score"))));
            map.put("weight", DoubleUtil.roundThree(String.valueOf(map.get("weight"))));
            map.put("name", String.valueOf((ObjectUtil.isEmpty(map.get("name"))?"-":map.get("name"))));
            map.put("createtime", String.valueOf(map.get("createTime")));

            String type = String.valueOf(map.get("type"));
            if("1".equals(type)){
                List<CategaryVo> categaryVos = orderMapper.selectListByOrderId(String.valueOf(map.get("orderId")));
                map.put("categary",categaryVos);
            }
            if("2".equals(type)){
                List<CategaryVo> categaryVos = orderMapper.selectJHYListByOrderId(String.valueOf(map.get("orderId")));
                map.put("categary",categaryVos);
            }
        }
        m.put("orderList", odlist);
        m.put("count", pageInfo.getTotal());