修改文件路径

mp-admin/src/main/java/com/qs/mp/web/controller/common/FileUploadController.java

@@ -52,11 +52,6 @@ public class FileUploadController extends BaseApiController {
     @Value("${cloud.private-bucket-name}")
     private String privateBucketName;
 
-    /**
-     * 模板原稿文件目录
-     */
-    @Value("${cloud.template-dir}")
-    private String tempSrcDir;
 
     @Autowired
     protected HostHolder hostHolder;
@@ -81,9 +76,9 @@ public class FileUploadController extends BaseApiController {
             LogUtil.info(log, "文件上传，fileName:{0}, ContentType:{1}", new Object[]{file.getOriginalFilename(), mimeType});
             String fileName = file.getOriginalFilename();
             String saveAs = fileName;
-            // 模板原稿文件保存到指定目录
-            if ("template".equals(fileType)){
-                saveAs = tempSrcDir + fileName;
+            // 指定目录
+            if (StringUtils.isNotBlank(fileType)){
+                saveAs = fileType + "/" + fileName;
             }
             QcloudFileUtils.putStream(file.getInputStream(), saveAs,
                 privateBucketName, mimeType);

mp-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ mp:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ygp/uploadPath，Linux配置 /home/ygp/uploadPath）
-  profile: /Users/steven/Documents
+  profile: /home/quanshu/mp-server
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -121,10 +121,7 @@ cloud:
   #public-bucket-name: ygp-public
   # 存储对象公开不可访问，需要通过应用下载
   #private-bucket-name: ygp-auth
-  # 合同模板存放目录
-  template-dir: files/template/
-  # 签署好的合同文件存放目录
-  contract-dir: files/contract/
+
 
 #小程序appid和密钥
 wx:

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -1,6 +1,8 @@
 package com.qs.mp.pay.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.mp.channel.service.IChannelOrderService;
 import com.qs.mp.common.enums.BizTypeEnum;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
@@ -10,6 +12,7 @@ import com.qs.mp.pay.domain.PayOrder;
 import com.qs.mp.pay.service.IPayOrderService;
 import com.qs.mp.pay.service.IWalletService;
 import com.qs.mp.system.service.id.BizIdGenerator;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +34,9 @@ public class WalletServiceImpl implements IWalletService {
   @Autowired
   private IPayOrderService payOrderService;
 
+  @Autowired
+  private IChannelOrderService channelOrderService;
+
   @Autowired
   private BizIdGenerator bizIdGenerator;
 
@@ -92,25 +98,25 @@ public class WalletServiceImpl implements IWalletService {
   public void payOrderStatusHandle(String orderNo) {
     //查询统一支付订单表，查询订单类型，然后根据不同类型做对应的逻辑处理
     //查询支付状态为1：支付成功，2：订单创建成功，等待支付。
-    /*LambdaQueryWrapper<PayOrder> wrapper = new LambdaQueryWrapper();
+    LambdaQueryWrapper<PayOrder> wrapper = new LambdaQueryWrapper();
     wrapper.eq(PayOrder::getOrderId,orderNo);
-    wrapper.eq(PayOrder::getOrderstatus,"1");
+    wrapper.eq(PayOrder::getStatus,"1");
     List<PayOrder> payOrderList = payOrderService.list(wrapper);
     if(payOrderList.size() != 1){
       //数据结构异常，告警
       LogUtil.error(logger,"数据结构异常，违反唯一约束，orderNo："+orderNo);
     }
-    //商户充值订单
+    //渠道订单
     PayOrder payOrder = payOrderList.get(0);
-    logger.info("order type:"+payOrder.getOrderType());
-    if (PayOrderTypeEnum.ORDER_MERCH_RECHARGE.getValue() == payOrder.getOrderType().intValue()) {
+    logger.info("biz type:"+payOrder.getBizType());
+    if (BizTypeEnum.CHANNEL_ORDER == payOrder.getBizType()) {
       // TODO 业务订单支付成功，调用业务订单服务处理
       // customerOrderService.paySuccess(payOrder);
     }
     else{
       //数据结构异常，告警
       LogUtil.error(logger,"该业务单据类型未支持，orderNo："+orderNo);
-    }*/
+    }
 }