修改支付接口判断

0a3e375c · kaevom · 60281576 · 0a3e375c · 0a3e375c · 0a3e375c
Commit 0a3e375c authored Apr 10, 2023 by kaevom
8 changed files
--- a/yongqi-admin/src/main/resources/application-dev.yml
+++ b/yongqi-admin/src/main/resources/application-dev.yml
@@ -175,7 +175,8 @@ wx:
    mchKey: fdfgg56hdfgh52sdf35dfgscfg84wsed #微信支付商户密钥
    subAppId: #服务商模式下的子商户公众账号ID
    subMchId: #服务商模式下的子商户号
-    keyPath: /opt/xinrenli/cert/ #C:\\ProgramData\\certKey\xinrenli\\apiclient_cert.p12  # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    #keyPath: C:\\ProgramData\\certKey\xinrenli\\apiclient_cert:p12  # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    keyPath: /opt/xinrenli/cert/
    notifyUrl: http://xinrenli.nyinhong.com/api/xinrenli/order/notify # 微信支付回调接口
    refundNotifyUrl: http://xinrenli.nyinhong.com/api/xinrenli/order/refundNotify # 微信t退款回调接口
  #  mp:

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbFileController.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbFileController.java
@@ -124,7 +124,7 @@ public class DbFileController extends BaseController {
    @PostMapping("/upload")
    public R upload(MultipartFile file, HttpServletRequest req) {
        if(!file.isEmpty()){
-            String uploadPath = "C:\\uploadFile";
+            //String uploadPath = "C:\\uploadFile";
            // 如果目录不存在则创建
            File uploadDir = new File(uploadPath);
            if (!uploadDir.exists()) {
@@ -134,7 +134,7 @@ public class DbFileController extends BaseController {
            String suffixName = OriginalFilename.substring(OriginalFilename.lastIndexOf("."));//获取文件后缀名
            //重新随机生成名字
            String filename = UUID.randomUUID().toString() +suffixName;
-            File localFile = new File(uploadPath+"\\"+filename);
+            File localFile = new File(uploadPath+filename);
            String url = "http://xinrenli.nyinhong.com/image/"+filename;
            try {
                file.transferTo(localFile); //把上传的文件保存至本地

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
@@ -70,6 +70,14 @@ public class DbOrderController extends BaseController {
        return iDbOrderService.homeList(bo, pageQuery);
    }
    /**
+    @SaCheckPermission("xinrenli:order:listUser")
+    @GetMapping("/listUser")
+    public TableDataInfo<DbOrderVo> listUser(DbOrderBo bo, PageQuery pageQuery) {
+        LoginUser loginUser = getLoginUser();
+        bo.setUserId(loginUser.getUserId());
+        return iDbOrderService.homeList(bo, pageQuery);
+    }
+    /**
     * 用户需求广场
     */
    @SaCheckPermission("xinrenli:order:userDemandSquare")

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/DbOrder.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/DbOrder.java
@@ -6,6 +6,7 @@ import lombok.Data;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 /**
 * 订单对象 db_order
@@ -117,4 +118,6 @@ public class DbOrder {
     */
    private Integer deleteStatus;
 }
--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java
@@ -134,4 +134,5 @@ public class DbOrderBo extends BaseEntity {
     */
    private List<DbFileBo> voiceList;
+    private  List<String> statusList;
 }
--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbOrderVo.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbOrderVo.java
@@ -73,7 +73,14 @@ public class DbOrderVo {
     */
    @ExcelProperty(value = "成交金额")
    private BigDecimal actualAmount;
+    /**
+     * 支付金额
+     */
+    private BigDecimal payAmount;
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount;
    /**
     * 备注说明
     */

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbArticleServiceImpl.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbArticleServiceImpl.java
@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.yongqi.common.utils.StringUtils;
 import com.yongqi.common.core.page.TableDataInfo;
 import com.yongqi.common.core.domain.PageQuery;
@@ -103,17 +104,21 @@ public class DbArticleServiceImpl implements IDbArticleService {
        boolean flag = baseMapper.insert(add) > 0;
        if (flag) {
            bo.setId(add.getId());
-            fileMapper.delete(Wrappers.<DbFile>lambdaQuery()
-                .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())
-                .eq(DbFile::getServiceType, FileEnumServiceType.ARTICLE.getServiceTyp())
-                .eq(DbFile::getServiceId, bo.getId())
-            );
            List<DbFile> files = BeanUtil.copyToList(bo.getFileVos(), DbFile.class);
-            files.forEach(file -> {
-                file.setServiceId(bo.getId());
+            if(ObjectUtils.isNotEmpty(files)){
-                file.setServiceType(FileEnumServiceType.ARTICLE.getServiceTyp());
+                fileMapper.delete(Wrappers.<DbFile>lambdaQuery()
-                file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
+                    .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())
-            });
+                    .eq(DbFile::getServiceType, FileEnumServiceType.ARTICLE.getServiceTyp())
+                    .eq(DbFile::getServiceId, bo.getId())
+                );
+                files.forEach(file -> {
+                    file.setServiceId(bo.getId());
+                    file.setServiceType(FileEnumServiceType.ARTICLE.getServiceTyp());
+                    file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
+                });
+            }
            fileMapper.insertBatch(files);
        }
        return flag;

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
@@ -83,10 +83,10 @@ public class DbOrderServiceImpl implements IDbOrderService {
                dbOrderVo.setPictureList(v);
            }
            if (k.equals("video")) {
-                dbOrderVo.setPictureList(v);
+                dbOrderVo.setVideoList(v);
            }
            if (k.equals("voice")) {
-                dbOrderVo.setPictureList(v);
+                dbOrderVo.setVoiceList(v);
            }
        });
        dbOrderVo.setFileVos(dbFileVos);
@@ -317,6 +317,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
        lqw.eq(StringUtils.isNotBlank(bo.getModifyUser()), DbOrder::getModifyUser, bo.getModifyUser());
        lqw.eq(bo.getModifyTime() != null, DbOrder::getModifyTime, bo.getModifyTime());
        lqw.eq(bo.getDeleteStatus() != null, DbOrder::getDeleteStatus, bo.getDeleteStatus());
+        lqw.in(bo.getStatusList() != null, DbOrder::getStatus, bo.getStatusList());
        return lqw;
    }
@@ -345,17 +346,16 @@ public class DbOrderServiceImpl implements IDbOrderService {
                    record.setPictureList(v);
                }
                if (k.equals("video")) {
-                    record.setPictureList(v);
+                    record.setVideoList(v);
                }
                if (k.equals("voice")) {
-                    record.setPictureList(v);
+                    record.setVoiceList(v);
                }
            });
            record.setFileVos(dbFileVo);
        });
        return TableDataInfo.build(result);
    }
    /**
     * 下单
     *