From 497ce9c14177f4ae518e2a9ca25e4004e84a6dfc Mon Sep 17 00:00:00 2001
From: zhangshengli <18103773227@163.com>
Date: Wed, 31 Jul 2024 13:47:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E4=BB=A3=E7=A0=81=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fuint/common/enums/YesOrNoEnum.java   |  15 +++++++++++++++
 .../common/service/impl/OrderServiceImpl.java |  17 +++++++++++++++--
 .../controller/BackendOrderController.java    |   2 +-
 .../main/resources/application-dev.properties |  10 +++++-----
 .../resources/application-prod.properties     |   2 +-
 .../template/订单导入模板.xlsx          | Bin 9001 -> 9225 bytes
 .../fuint/framework/web/ResponseObject.java   |   6 ++++--
 .../com/fuint/repository/model/MtOrder.java   |  14 +++++++-------
 8 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/YesOrNoEnum.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/YesOrNoEnum.java
index 0d4c355..f54d289 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/YesOrNoEnum.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/YesOrNoEnum.java
@@ -36,4 +36,19 @@ public enum YesOrNoEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    /**
+     * 根据value获取key
+     *
+     * @return
+     */
+    public static String getKeyName(String value) {
+        final YesOrNoEnum[] values = YesOrNoEnum.values();
+        for (YesOrNoEnum order : values) {
+            if (value.equals(order.getValue())) {
+                return order.getKey();
+            }
+        }
+        return null;
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java
index ac0b79c..0df408e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java
@@ -3,6 +3,7 @@ package com.fuint.common.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.common.Constants;
@@ -60,7 +61,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
     private MtOrderMapper mtOrderMapper;
 
     private MtGoodsMapper mtGoodsMapper;
-
+    private MtUserMapper mtUserMapper;
     private MtOrderGoodsMapper mtOrderGoodsMapper;
 
     private MtCartMapper mtCartMapper;
@@ -2237,8 +2238,20 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
                 }
             }
             String userName = rowContent.get(6);
+          if (ObjectUtil.isNotEmpty(userName)){
+              MtUser m= mtUserMapper.selectOne(new QueryWrapper<MtUser>().lambda().eq(MtUser::getMobile,userName));
+              if(ObjectUtil.isNotEmpty(m)){
+                  order.setUserId(m.getId());
+              }
+          }
             String isVisitor = rowContent.get(7);
-            order.setIsVisitor(isVisitor);
+            if(StringUtil.isNotEmpty(isVisitor)){
+                String keyName = YesOrNoEnum.getKeyName(isVisitor);
+                if(StringUtil.isNotEmpty(keyName)){
+                    order.setIsVisitor(keyName);
+                }
+            }
+
             String amount = rowContent.get(8);
             if(StringUtil.isNotEmpty(amount)){
                 order.setAmount(new BigDecimal(amount));
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java
index d591330..1ccbdc0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java
@@ -615,7 +615,7 @@ public class BackendOrderController extends BaseController {
      * @throws
      */
     @ApiOperation(value = "上传文件")
-    @RequestMapping(value = "/importData", method = RequestMethod.POST, produces = "text/html;charset=UTF-8")
+    @RequestMapping(value = "/importData", method = RequestMethod.POST)
     @CrossOrigin
     public ResponseObject uploadFile(HttpServletRequest request, @RequestParam("file") MultipartFile file) throws Exception {
         String token = request.getHeader("Access-Token");
diff --git a/fuintBackend/fuint-application/src/main/resources/application-dev.properties b/fuintBackend/fuint-application/src/main/resources/application-dev.properties
index ae6a85e..457d47f 100644
--- a/fuintBackend/fuint-application/src/main/resources/application-dev.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application-dev.properties
@@ -32,13 +32,13 @@ system.name = \u674E\u5B66\u6B66\u7261\u4E39\u74F7\u5B98\u65B9\u65D7\u8230\u5E97
 website.url=https://www.huamar.com/h5/
 
 # \u4E0A\u4F20\u56FE\u7247\u672C\u5730\u5730\u5740
-#images.root=D:/daima/yshi/fuintBackend/fuint-application/target/classes
-images.root=D:/download
-images.path=/profile/
-#images.path=/static/uploadImages/
+images.root=/target/classes
+#images.root=D:/download
+#images.path=/profile/
+images.path=/static/uploadImages/
 
 # \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
-images.upload.url=http://192.168.10.110:8999
+images.upload.url=http://192.168.10.70:8999
 
 # \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09
 images.upload.maxSize=5
diff --git a/fuintBackend/fuint-application/src/main/resources/application-prod.properties b/fuintBackend/fuint-application/src/main/resources/application-prod.properties
index 3aff22f..071a7bc 100644
--- a/fuintBackend/fuint-application/src/main/resources/application-prod.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application-prod.properties
@@ -36,7 +36,7 @@ website.url=https://www.fuint.cn/h5/
 images.path=/static/uploadImages/
 
 # \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
-images.upload.url=http://192.168.10.31:8999l
+images.upload.url=http://192.168.10.31:8999
 
 # \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09
 images.upload.maxSize=5
diff --git a/fuintBackend/fuint-application/src/main/resources/template/订单导入模板.xlsx b/fuintBackend/fuint-application/src/main/resources/template/订单导入模板.xlsx
index 8b93e0381b0569231c484868183b85fcaaa0ee09..f7541e1c217fdbb3c8410326f6079ff21c949cb2 100644
GIT binary patch
literal 9225
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
b{r|%LA;AIi@V^!-7UXaVB1G<h>;d;bN1@I)

literal 9001
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

diff --git a/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/web/ResponseObject.java b/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/web/ResponseObject.java
index 8bcb287..bdb499b 100644
--- a/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/web/ResponseObject.java
+++ b/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/web/ResponseObject.java
@@ -1,5 +1,7 @@
 package com.fuint.framework.web;
 
+import java.io.Serializable;
+
 /**
  * 返回数据结构
  *
@@ -7,8 +9,8 @@ package com.fuint.framework.web;
  *
  * CopyRight https://www.fuint.cn
  */
-public class ResponseObject {
-
+public class ResponseObject implements Serializable {
+    private static final long serialVersionUID = 2515641477316172528L;
     private int code;
     private String message;
     private Object data;
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java
index 102b6c7..9afef18 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java
@@ -36,7 +36,7 @@ public class MtOrder implements Serializable {
     private String payType;
 
     @ApiModelProperty("订单模式")
-    private String orderMode;
+    private String orderMode ;
 
     @ApiModelProperty("订单号")
     private String orderSn;
@@ -57,7 +57,7 @@ public class MtOrder implements Serializable {
     private String verifyCode;
 
     @ApiModelProperty("是否游客")
-    private String isVisitor;
+    private String isVisitor="N";
 
     @ApiModelProperty("订单金额")
     private BigDecimal amount;
@@ -90,19 +90,19 @@ public class MtOrder implements Serializable {
     private String remark;
 
     @ApiModelProperty("创建时间")
-    private Date createTime;
+    private Date createTime = new Date();
 
     @ApiModelProperty("更新时间")
-    private Date updateTime;
+    private Date updateTime  = new Date();
 
     @ApiModelProperty("订单状态")
-    private String status;
+    private String status ="B";
 
     @ApiModelProperty("支付时间")
-    private Date payTime;
+    private Date payTime = new Date();
 
     @ApiModelProperty("支付状态")
-    private String payStatus;
+    private String payStatus="B";
 
     @ApiModelProperty("操作员工")
     private Integer staffId;