From 35bfed834faee8b04988e9f202a0f5c79b13b405 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 09 Aug 2021 16:12:48 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index f2bdae2..61f23c9 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/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;
@@ -101,6 +100,7 @@
Long id = model.getId();
JhyOrder jhyOrder = jhyOrderMapper.selectByPrimaryKey(id);
jhyOrder.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
+ jhyOrder.setJhyId("");
jhyOrderMapper.updateByPrimaryKey(jhyOrder);
}
@@ -162,4 +162,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);
+ }
}
--
Gitblit v1.9.1