Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-07-23 71bf751d248aff415c95b2bc09dc1bb0219c9428

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

@@ -100,6 +100,7 @@
        Long id = model.getId();
        JhyOrder jhyOrder = jhyOrderMapper.selectByPrimaryKey(id);
        jhyOrder.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
        jhyOrder.setJhyId("");
        jhyOrderMapper.updateByPrimaryKey(jhyOrder);
    }

@@ -162,11 +163,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);
    }