From 4cfee620f764af1c8016fbcea333622cf7ca0254 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Tue, 6 Dec 2022 21:25:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/chjyj/szwh/bean/OrderGoodsSource.java     | 10 +++++-----
 .../cn/chjyj/szwh/controller/api/OrderController.java |  1 -
 .../cn/chjyj/szwh/service/impl/OrderServiceImpl.java  | 11 +++++++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/bean/OrderGoodsSource.java b/src/main/java/cn/chjyj/szwh/bean/OrderGoodsSource.java
index fb22264..be856cf 100644
--- a/src/main/java/cn/chjyj/szwh/bean/OrderGoodsSource.java
+++ b/src/main/java/cn/chjyj/szwh/bean/OrderGoodsSource.java
@@ -27,7 +27,7 @@ public class OrderGoodsSource implements Serializable {
     private String sourceType;// 源类型；1图书/2：期刊/3：报纸/4：音像/5：音频/6：视频/7：其他文献/8：图片/9：文化产品
     private String sourceNameType;//源名称类型-->源标识符类型：ISBN/ISLI/CN
     private String sourceName;//源名称
-    private String sourceidentify;//源标识符：源标识符类型 + 源标识符（ISBN000000XXXXXX）
+    private String sourceIdentify;//源标识符：源标识符类型 + 源标识符（ISBN000000XXXXXX）
     private String sourceFragment;//源片段
     private String targetName;//目标名称-->整体目标作品名称
     private String targetNameType;//目标名称类型-->目标标识符类型：ISBN/ISLI
@@ -133,12 +133,12 @@ public class OrderGoodsSource implements Serializable {
         this.sourceName = sourceName;
     }
 
-    public String getSourceidentify() {
-        return sourceidentify;
+    public String getSourceIdentify() {
+        return sourceIdentify;
     }
 
-    public void setSourceidentify(String sourceidentify) {
-        this.sourceidentify = sourceidentify;
+    public void setSourceIdentify(String sourceIdentify) {
+        this.sourceIdentify = sourceIdentify;
     }
 
     public String getSourceFragment() {
diff --git a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
index e49c4e4..561d02f 100644
--- a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
@@ -158,7 +158,6 @@ public class OrderController extends BaseController {
         String redisKey = "createOrder_"+userIsli;
         Object redisCon = RedisUtil.get(redisKey);
 
-
         Map<String,Object> retmap = orderService.createOrder(userIsli,jGoodsArray);
         if(redisCon!=null){
             jsonObject.put("code","error");
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
index ab449b8..f1357c0 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
@@ -667,6 +667,17 @@ public class OrderServiceImpl implements OrderService {
         orderGoodsDetail.setOrderIslicode(batchCode);
         // 新增订单商品
         orderGoodsDetailMapper.addOrderGoodsDetail(orderGoodsDetail);
+        //订单商品资源
+        //返回订单商品明细id
+        Integer ordgid = orderGoodsDetail.getId();
+        List<GoodsSource> gslist = goodsSourceMapper.getGoodsSourceByIsli(goods.getGoodsIslicode());
+        //todo 待检测非空
+        for(GoodsSource gs:gslist){
+            // 订单商品资源
+            OrderGoodsSource orderGoodsSource = SzOrderUtils.mkordGoodsSource(gs,ordgid,batchCode);
+            orderGoodsSourceMapper.addOrderGoodsSource(orderGoodsSource);
+        }
+
 
         // 创建订单实体
         Order order = new Order();