20210825

xiaoyong931011

2021-08-25 6c1a535a157864b177c17aa14afcda9ad92a2a9b

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

@@ -53,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){
@@ -163,11 +174,10 @@
        return total;
    }

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