20210825

xiaoyong931011

2021-08-25 6c1a535a157864b177c17aa14afcda9ad92a2a9b

 gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java

@@ -6,11 +6,10 @@
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.utils.StringUtils;
import com.xzx.gc.entity.JhyOrder;
import com.xzx.gc.entity.JhyOrderItems;
import com.xzx.gc.entity.ScoreOrder;
import com.xzx.gc.entity.ScoreOrderDetails;
import com.xzx.gc.entity.*;
import com.xzx.gc.shop.dto.AssignJhyOrderDto;
import com.xzx.gc.shop.dto.CancelJhyOrderDto;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
import com.xzx.gc.shop.mapper.JhyOrderItemsMapper;
@@ -54,6 +53,17 @@
        String name = model.getAccount();
        model.setAccount(name);
        model.setAccountPhone(accountPhone);
        List<Integer> status = new ArrayList<>();
        if(CollUtil.isEmpty(model.getStatus())){
            status.add(1);
            status.add(2);
            status.add(3);
            status.add(4);
            status.add(5);
            status.add(6);
            model.setStatus(status);
        }

        List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
        if(CollUtil.isNotEmpty(maps)){
            for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
@@ -101,6 +111,7 @@
        Long id = model.getId();
        JhyOrder jhyOrder = jhyOrderMapper.selectByPrimaryKey(id);
        jhyOrder.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
        jhyOrder.setJhyId("");
        jhyOrderMapper.updateByPrimaryKey(jhyOrder);
    }

@@ -162,4 +173,12 @@

        return total;
    }

    public void assignJhyOrder(AssignJhyOrderDto model,String userId) {
        Long orderId = model.getOrderId();
        JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
        order.setJhyId(userId);
        order.setStatus(JhyOrder.ORDER_STATUS_IMG);
        jhyOrderMapper.updateByPrimaryKey(order);
    }
}