Merge branch 'main' of http://hmgit.huamar.com:8881/zhangshengli/yshi

fuintAdmin/src/main.js

@@ -12,7 +12,7 @@ import store from './store'
 import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
+import { download,download1,download2 } from '@/utils/request'
 
 import './assets/icons' // icon
 import './permission' // permission control
@@ -42,14 +42,19 @@ import Print from 'vue-print-nb'
 import TreeSelect from '@/components/TreeSelect'
 // 会员选择组件
 import UserSelect from '@/components/UserSelect'
+import { selectDictLabel, selectDictLabels} from "@/utils/ruoyi";
 
 // 全局方法挂载
 Vue.prototype.getConfigKey = getConfigKey
+Vue.prototype.selectDictLabel = selectDictLabel
+Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.parseTime = parseTime
 Vue.prototype.resetForm = resetForm
 Vue.prototype.addDateRange = addDateRange
 Vue.prototype.getName = getName
 Vue.prototype.download = download
+Vue.prototype.download1 = download1
+Vue.prototype.download2 = download2
 Vue.prototype.handleTree = handleTree
 
 // 全局组件挂载

fuintAdmin/src/utils/request.js

@@ -1,14 +1,15 @@
 import axios from 'axios'
-import { Notification, MessageBox, Message } from 'element-ui'
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { tansParams } from "@/utils/fuint";
 import cache from '@/plugins/cache'
-
+import request from '@/utils/request'
+import { blobValidate } from "@/utils/ruoyi";
 // 是否显示重新登录
 export let isRelogin = { show: false };
-
+let downloadLoadingInstance;
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
@@ -135,6 +136,42 @@ export function download(url, params) {
    window.open(url, '_blank')
 }
 
+// 通用下载方法
+export function download1(url, params) {
+  return request({
+    url: url + '?token='+ getToken() + '&'+ param(params),
+    method: 'get'
+  })
+  //  url = process.env.VUE_APP_BASE_API + url + '?token='+ getToken() + '&'+ param(params)
+  //  window.open(url, '_blank')
+}
+// 通用下载方法
+export function download2(url, params, filename, config) {
+  downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+  return service.post(url, params, {
+    transformRequest: [(params) => { return tansParams(params) }],
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    responseType: 'blob',
+    ...config
+  }).then(async (data) => {
+    const isBlob = blobValidate(data);
+    if (isBlob) {
+      const blob = new Blob([data])
+      saveAs(blob, filename)
+    } else {
+      const resText = await data.text();
+      const rspObj = JSON.parse(resText);
+      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+      Message.error(errMsg);
+    }
+    downloadLoadingInstance.close();
+  }).catch((r) => {
+    console.error(r)
+    Message.error('下载文件出现错误，请联系管理员！')
+    downloadLoadingInstance.close();
+  })
+}
+
 // 组织参数
 export function param(data) {
    let url = ''

fuintAdmin/src/views/order/index.vue

@@ -91,6 +91,13 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+            >导入</el-button>
       </el-form-item>
     </el-form>
 
@@ -387,6 +394,32 @@
       </div>
     </el-dialog>
     <!-- 退款对话框 end -->
+     <!-- 订单导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -395,6 +428,7 @@ import { getName } from "@/utils/fuint";
 import { getOrderList, updateOrderStatus, getOrderInfo, saveOrder, deleteOrder, verifyOrder, delivered } from "@/api/order";
 import { doRefund } from "@/api/refund";
 import orderPrintDialog from '../cashier/components/orderPrintDialog'
+import { getToken } from "@/utils/auth";
 export default {
   name: "OrderIndex",
   components: {
@@ -486,7 +520,22 @@ export default {
           { required: true, message: "退款金额不能为空", trigger: "blur" },
           { pattern: /((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/, message: `请输入正确的退款金额`, trigger: 'blur' }
         ]
-      }
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { 'Access-Token': getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/backendApi/order/importData"
+      },
     };
   },
   created() {
@@ -768,6 +817,32 @@ export default {
           break;
       }
     },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download2('/backendApi/order/exportTemplate', {
+      }, `订单模板${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
   }
 };
 </script>

fuintAdmin/src/views/store/list.vue

@@ -329,6 +329,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- <el-row>
+          <el-col :span="24">
+            <el-form-item label="店铺详情">
+              <editor v-model="form.mtDetails" :min-height="550"/>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确定</el-button>
@@ -384,7 +391,7 @@ export default {
       hideUpload: false,
       // 上传文件列表
       uploadFiles: [],
-      uploadHeader: { 'Access-Token' : getToken() },
+      uploadHeader: { 'Access-token' : getToken() },
       merchantOptions: [],
       // 图片根目录
       imagePath: "",

fuintBackend/fuint-application/src/main/java/com/fuint/common/config/WebConfig.java

@@ -3,8 +3,10 @@ package com.fuint.common.config;
 import com.fuint.common.web.AdminUserInterceptor;
 import com.fuint.common.web.CommandInterceptor;
 import com.fuint.common.web.ClientUserInterceptor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 import org.springframework.http.CacheControl;
 import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.config.annotation.*;
@@ -21,8 +23,15 @@ import java.util.concurrent.TimeUnit;
 @Configuration
 public class WebConfig extends WebMvcConfigurationSupport {
 
+    @Value("${images.root}")
+    private String urlFile;
+    @Value("${images.path}")
+    private String imgPath;
+
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        /** 本地文件上传路径 */
+        registry.addResourceHandler(imgPath+"**").addResourceLocations("file:" + urlFile+imgPath);
         registry.addResourceHandler("/resources/**")
                 .addResourceLocations("/resources/", "classpath:/other-resources/")
                 .setCacheControl(CacheControl.maxAge(365, TimeUnit.DAYS))

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/StoreDto.java

@@ -106,4 +106,7 @@ public class StoreDto implements Serializable {
     @ApiModelProperty("最后操作人")
     private String operator;
 
+    @ApiModelProperty("店铺详情")
+    private String mtDetails;
+
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/OrderModeEnum.java

@@ -34,4 +34,34 @@ public enum OrderModeEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    /**
+     * 根据key获取value
+     *
+     * @param key
+     * @return
+     */
+    public static String getName(String key) {
+        final OrderModeEnum[] values = OrderModeEnum.values();
+        for (OrderModeEnum value : values) {
+            if (key.equals(value.getKey())) {
+                return value.getValue();
+            }
+        }
+        return null;
+    }
+    /**
+     * 根据value获取key
+     *
+     * @return
+     */
+    public static String getKeyName(String value) {
+        final OrderModeEnum[] values = OrderModeEnum.values();
+        for (OrderModeEnum order : values) {
+            if (value.equals(order.getValue())) {
+                return order.getKey();
+            }
+        }
+        return null;
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/OrderTypeEnum.java

@@ -53,4 +53,18 @@ public enum OrderTypeEnum {
         }
         return null;
     }
+    /**
+     * 根据value获取key
+     *
+     * @return
+     */
+    public static String getKeyName(String value) {
+        final OrderTypeEnum[] values = OrderTypeEnum.values();
+        for (OrderTypeEnum order : values) {
+            if (value.equals(order.getValue())) {
+                return order.getKey();
+            }
+        }
+        return null;
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/PayTypeEnum.java

@@ -37,4 +37,34 @@ public enum PayTypeEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    /**
+     * 根据key获取value
+     *
+     * @param key
+     * @return
+     */
+    public static String getName(String key) {
+        final PayTypeEnum[] values = PayTypeEnum.values();
+        for (PayTypeEnum value : values) {
+            if (key.equals(value.getKey())) {
+                return value.getValue();
+            }
+        }
+        return null;
+    }
+    /**
+     * 根据value获取key
+     *
+     * @return
+     */
+    public static String getKeyName(String value) {
+        final PayTypeEnum[] values = PayTypeEnum.values();
+        for (PayTypeEnum order : values) {
+            if (value.equals(order.getValue())) {
+                return order.getKey();
+            }
+        }
+        return null;
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/excelDto/UserOrderExcelDto.java

@@ -0,0 +1,74 @@
+package com.fuint.common.excelDto;
+
+import com.fuint.common.dto.*;
+import com.fuint.repository.model.MtRefund;
+import com.fuint.repository.model.MtStore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 会员订单实体类
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
+public class UserOrderExcelDto implements Serializable {
+
+    @ApiModelProperty("订单类型")
+    private String type;
+
+    @ApiModelProperty("支付类型")
+    private String payType;
+
+    @ApiModelProperty("订单模式")
+    private String orderMode;
+
+    @ApiModelProperty("订单号")
+    private String orderSn;
+
+    @ApiModelProperty("所属商户")
+    private String merchantName;
+
+    @ApiModelProperty("所属店铺")
+    private String storeName;
+
+    @ApiModelProperty("用户手机号")
+    private String userName;
+
+    @ApiModelProperty("是否游客")
+    private String isVisitor;
+
+    @ApiModelProperty("订单金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty("支付金额")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty("使用积分数量")
+    private Integer usePoint;
+
+    @ApiModelProperty("积分金额")
+    private BigDecimal pointAmount;
+
+    @ApiModelProperty("折扣金额")
+    private BigDecimal discount;
+
+    @ApiModelProperty("配送费用")
+    private BigDecimal deliveryFee;
+
+    @ApiModelProperty("支付时间")
+    private Date payTime;
+
+    @ApiModelProperty("操作员工")
+    private String staffName;
+
+}
+

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/OrderService.java

@@ -9,6 +9,8 @@ import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.repository.model.MtCart;
 import com.fuint.repository.model.MtOrder;
+import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -239,4 +241,20 @@ public interface OrderService extends IService<MtOrder> {
      * @return
      * */
     List<MtOrder> getTobeCommissionOrderList(String dateTime) throws BusinessCheckException;
+
+    /**
+     * 保存文件
+     *
+     * @param file excel文件
+     * @param request 操作者
+     * */
+    String saveExcelFile(MultipartFile file, HttpServletRequest request) throws Exception;
+
+    /**
+     * 导入发券列表
+     *
+     * @param file excel文件
+     * @param operator 操作者
+     * */
+    String importSendCoupon(MultipartFile file, String operator, String filePath) throws BusinessCheckException;
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -1,5 +1,6 @@
 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.toolkit.Wrappers;
@@ -7,13 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.common.Constants;
 import com.fuint.common.dto.*;
 import com.fuint.common.enums.*;
+import com.fuint.common.excelDto.UserOrderExcelDto;
 import com.fuint.common.param.OrderListParam;
 import com.fuint.common.param.SettlementParam;
 import com.fuint.common.service.*;
-import com.fuint.common.util.CommonUtil;
+import com.fuint.common.util.*;
-import com.fuint.common.util.DateUtil;
-import com.fuint.common.util.SeqUtil;
-import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationResponse;
@@ -30,14 +29,20 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.env.Environment;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.multipart.MultipartFile;
 import weixin.popular.util.JsonUtil;
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -169,6 +174,11 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
      * */
     private PaymentService paymentService;
 
+    /**
+     * 系统环境变量
+     * */
+    private Environment env;
+
     /**
      * 获取用户订单列表
      * @param  orderListParam
@@ -2116,4 +2126,153 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
     public List<MtOrder> getTobeCommissionOrderList(String dateTime) {
         return mtOrderMapper.getTobeCommissionOrderList(dateTime);
     }
+
+    /**
+     * 保存文件
+     *
+     * @param file excel文件
+     * @param request
+     * */
+    public String saveExcelFile(MultipartFile file, HttpServletRequest request) throws Exception {
+        String fileName = file.getOriginalFilename();
+
+        String imageName = fileName.substring(fileName.lastIndexOf("."));
+        String pathRoot = env.getProperty("images.root");
+        if (pathRoot == null || StringUtil.isEmpty(pathRoot)) {
+            pathRoot = ResourceUtils.getURL("classpath:").getPath();
+        }
+        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+
+        String filePath = "/static/uploadFiles/"+ DateUtil.formatDate(new Date(), "yyyyMMdd")+"/";
+        String path = filePath + uuid + imageName;
+
+        try {
+            File tempFile = new File(pathRoot + path);
+            if (!tempFile.getParentFile().exists()) {
+                tempFile.getParentFile().mkdirs();
+            }
+            CommonUtil.saveMultipartFile(file, pathRoot + path);
+        } catch (Exception e) {
+            //empty
+        }
+
+        return path;
+    }
+
+    /**
+     * 导入订单列表
+     *
+     * @param file excel文件
+     * @param operator 操作者
+     * */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    @OperationServiceLog(description = "导入订单列表")
+    public String importSendCoupon(MultipartFile file, String operator, String filePath) throws BusinessCheckException {
+        String originalFileName = file.getOriginalFilename();
+        boolean isExcel2003 = XlsUtil.isExcel2003(originalFileName);
+        boolean isExcel2007 = XlsUtil.isExcel2007(originalFileName);
+
+        if (!isExcel2003 && !isExcel2007) {
+            logger.error("importSendCouponController->uploadFile：{}", "文件类型不正确");
+            throw new BusinessCheckException("文件类型不正确");
+        }
+
+        List<List<String>> content = new ArrayList<>();
+        try {
+            content = XlsUtil.readExcelContent(file.getInputStream(), isExcel2003, 1, null, null, null);
+        } catch (IOException e) {
+            logger.error("CouponGroupServiceImpl->parseExcelContent{}", e);
+            throw new BusinessCheckException("导入失败"+e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        StringBuffer errorMsg = new StringBuffer();
+        StringBuffer errorMsgNoGroup = new StringBuffer();
+        StringBuffer errorMsgNoNum = new StringBuffer();
+        StringBuffer errorMsgNoRegister = new StringBuffer();
+
+        List<MtOrder> rows = new ArrayList<>();
+
+        for (int i = 0; i < content.size(); i++) {
+            List<Integer> groupIdArr = new ArrayList<>();
+            List<Integer> numArr = new ArrayList<>();
+
+            List<String> rowContent = content.get(i);
+            MtOrder order = new MtOrder();
+            String type = rowContent.get(0);
+            if(StringUtil.isNotEmpty(type)){
+                String keyName = OrderTypeEnum.getKeyName(type);
+                if(StringUtil.isNotEmpty(keyName)){
+                    type = keyName;
+                }
+            }
+            order.setType(type);
+            String payType = rowContent.get(1);
+            if(StringUtil.isNotEmpty(payType)){
+                String keyName = PayTypeEnum.getKeyName(payType);
+                if(StringUtil.isNotEmpty(keyName)){
+                    payType = keyName;
+                }
+            }
+            order.setPayType(payType);
+            String orderMode = rowContent.get(2);
+            if(StringUtil.isNotEmpty(orderMode)){
+                String keyName = OrderModeEnum.getKeyName(orderMode);
+                if(StringUtil.isNotEmpty(keyName)){
+                    orderMode = keyName;
+                }
+            }
+            order.setOrderMode(orderMode);
+            String orderSn = rowContent.get(3);
+            order.setOrderSn(orderSn);
+            String merchantName = rowContent.get(4);
+//            order.setMerchantId();
+            String storeName = rowContent.get(5);
+            if(StringUtil.isNotEmpty(storeName)){
+                StoreDto storeDto = storeService.queryStoreByName(storeName);
+                if(ObjectUtil.isNotEmpty(storeDto)){
+                    order.setStoreId(storeDto.getId());
+                }
+            }
+            String userName = rowContent.get(6);
+            String isVisitor = rowContent.get(7);
+            order.setIsVisitor(isVisitor);
+            String amount = rowContent.get(8);
+            if(StringUtil.isNotEmpty(amount)){
+                order.setAmount(new BigDecimal(amount));
+            }
+            String payAmount = rowContent.get(9);
+            if(StringUtil.isNotEmpty(payAmount)){
+                order.setPayAmount(new BigDecimal(payAmount));
+            }
+            String usePoint = rowContent.get(10);
+            if(StringUtil.isNotEmpty(usePoint)){
+                order.setUsePoint(Integer.valueOf(usePoint));
+            }
+            String pointAmount = rowContent.get(11);
+            if(StringUtil.isNotEmpty(pointAmount)){
+                order.setPointAmount(new BigDecimal(pointAmount));
+            }
+            String discount = rowContent.get(12);
+            if(StringUtil.isNotEmpty(discount)){
+                order.setDiscount(new BigDecimal(discount));
+            }
+            String deliveryFee = rowContent.get(13);
+            if(StringUtil.isNotEmpty(deliveryFee)){
+                order.setDeliveryFee(new BigDecimal(deliveryFee));
+            }
+            String payTime = rowContent.get(14);
+            String staffName = rowContent.get(15);
+//            order.setStaffId();
+            mtOrderMapper.insert(order);
+        }
+
+
+        // 导入批次
+        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+
+        return uuid;
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/StoreServiceImpl.java

@@ -158,6 +158,7 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
         mtStore.setBankCardName(storeDto.getBankCardName());
         mtStore.setBankCardNo(storeDto.getBankCardNo());
         mtStore.setUpdateTime(new Date());
+        mtStore.setMtDetails(storeDto.getMtDetails());
         if (storeDto.getId() == null) {
             mtStore.setCreateTime(new Date());
         }

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java

@@ -10,8 +10,11 @@ import com.fuint.common.param.OrderListParam;
 import com.fuint.common.service.*;
 import com.fuint.common.util.DateUtil;
 import com.fuint.common.util.TokenUtil;
+import com.fuint.common.util.XlsUtil;
+import com.fuint.framework.dto.ExcelExportDto;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationResponse;
+import com.fuint.framework.service.ExportService;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import com.fuint.repository.mapper.MtOrderGoodsMapper;
@@ -21,12 +24,20 @@ import com.fuint.utils.TimeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import lombok.extern.java.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -77,6 +88,13 @@ public class BackendOrderController extends BaseController {
      */
     private SettingService settingService;
 
+    /**
+     * 导出服务接口
+     * */
+    private ExportService exportService;
+
+    private static final Logger logger = LoggerFactory.getLogger(BackendCouponGroupController.class);
+
     /**
      * 订单列表查询
      *
@@ -559,5 +577,56 @@ public class BackendOrderController extends BaseController {
 
     }
 
+    /**
+     * 导出模板文件
+     *
+     * @param request
+     * @param response
+     * @throws BusinessCheckException
+     */
+    @ApiOperation(value = "导出模板文件")
+    @RequestMapping(value = "/exportTemplate", method = RequestMethod.POST)
+    @CrossOrigin
+    public void exportTemplate(HttpServletRequest request, HttpServletResponse response) throws BusinessCheckException {
+        ClassLoader classLoader = this.getClass().getClassLoader();
+        URL url = classLoader.getResource("");
+        String srcTemplateFilePath = url.getPath();
+
+        ExcelExportDto excelExportDto = new ExcelExportDto();
+        excelExportDto.setSrcPath(srcTemplateFilePath);
+        excelExportDto.setSrcTemplateFileName("template" + File.separator + "订单导入模板.xlsx");
+
+        String filename = "订单导入模板" + ".xlsx";
+        try {
+            OutputStream out = response.getOutputStream();
+            XlsUtil.setXlsHeader(request, response, filename);
+            excelExportDto.setOut(out);
+            exportService.exportLocalFile(excelExportDto);
+        } catch (Exception e) {
+            logger.error("导出出错", e);
+            throw new BusinessCheckException("导出出错");
+        }
+    }
+
+    /**
+     * 上传文件
+     *
+     * @param request
+     * @throws
+     */
+    @ApiOperation(value = "上传文件")
+    @RequestMapping(value = "/importData", method = RequestMethod.POST, produces = "text/html;charset=UTF-8")
+    @CrossOrigin
+    public ResponseObject uploadFile(HttpServletRequest request, @RequestParam("file") MultipartFile file) throws Exception {
+        String token = request.getHeader("Access-Token");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
+        String filePath = orderService.saveExcelFile(file, request);
+        String uuid = orderService.importSendCoupon(file, accountInfo.getAccountName(), filePath);
+        return getSuccessResult(uuid);
+    }
 
 }

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStoreController.java

@@ -228,6 +228,7 @@ public class BackendStoreController extends BaseController {
         String bankCardNo = params.get("bankCardNo") == null ? "" : CommonUtil.replaceXSS(params.get("bankCardNo").toString());
         String status = params.get("status") != null ? params.get("status").toString() : StatusEnum.ENABLED.getKey();
         String merchantId = params.get("merchantId").toString();
+        String mtDetails = params.get("mtDetails").toString();
 
         if ((StringUtil.isEmpty(latitude) || StringUtil.isEmpty(longitude)) && StringUtil.isNotEmpty(address)) {
             Map<String, Object> latAndLng = CommonUtil.getLatAndLngByAddress(address);
@@ -261,6 +262,7 @@ public class BackendStoreController extends BaseController {
         storeInfo.setAlipayAppId(alipayAppId);
         storeInfo.setAlipayPrivateKey(alipayPrivateKey);
         storeInfo.setAlipayPublicKey(alipayPublicKey);
+        storeInfo.setMtDetails(mtDetails);
         if (StringUtil.isNotEmpty(merchantId)) {
             storeInfo.setMerchantId(Integer.parseInt(merchantId));
         }

fuintBackend/fuint-application/src/main/resources/application-dev.properties

@@ -1,5 +1,5 @@
 # \u6570\u636E\u5E93\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://192.168.10.31:7536/fuint-db1?useUnicode=true&characterEncoding=UTF8&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.10.31:7536/mu-dan-ci-shop?useUnicode=true&characterEncoding=UTF8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=a8EYUSoT8wHbuRkX
 
@@ -9,11 +9,11 @@ spring.session.redis.namespace=fuint
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
 spring.redis.database=0
 # Redis\u670D\u52A1\u5668\u5730\u5740(\u751F\u4EA7)
-spring.redis.host=192.168.10.31
+spring.redis.host=120.46.159.203
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-spring.redis.port=7679
+spring.redis.port=16379
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=
+spring.redis.password=a8EYUSoT8wHbuRkX
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.pool.max-active=-1
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
@@ -26,17 +26,19 @@ spring.redis.pool.min-idle=0
 spring.redis.timeout=0
 
 # \u7CFB\u7EDF\u540D\u79F0
-system.name = fuint\u4F1A\u5458\u8425\u9500\u7BA1\u7406\u7CFB\u7EDF
+system.name = \u674E\u5B66\u6B66\u7261\u4E39\u74F7\u5B98\u65B9\u65D7\u8230\u5E97
 
 # \u524D\u7AEFh5\u5730\u5740
 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:/daima/yshi/fuintBackend/fuint-application/target/classes
-images.path=/static/uploadImages/
+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.1.103:8999
+images.upload.url=http://192.168.10.110:8999
 
 # \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09
 images.upload.maxSize=5

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtStore.java

@@ -113,4 +113,7 @@ public class MtStore implements Serializable {
     @ApiModelProperty("最后操作人")
     private String operator;
 
+    @ApiModelProperty("店铺详情")
+    private String mtDetails;
+
 }