Merge remote-tracking branch 'origin/master'

7becfd9a · kaevom · ffecb09f · 7b72bd30 · 7becfd9a · 7becfd9a
Commit 7becfd9a authored Apr 11, 2023 by kaevom
7 changed files
--- a/yongqi-admin/src/main/java/com/yongqi/web/controller/system/SysLoginController.java
+++ b/yongqi-admin/src/main/java/com/yongqi/web/controller/system/SysLoginController.java
 package com.yongqi.web.controller.system;
 import cn.dev33.satoken.annotation.SaIgnore;
-import cn.dev33.satoken.context.SaHolder;
 import com.yongqi.common.constant.Constants;
 import com.yongqi.common.core.domain.R;
 import com.yongqi.common.core.domain.entity.SysMenu;
@@ -9,8 +8,8 @@ import com.yongqi.common.core.domain.entity.SysUser;
 import com.yongqi.common.core.domain.model.LoginBody;
 import com.yongqi.common.core.domain.model.LoginUser;
 import com.yongqi.common.core.domain.model.SmsLoginBody;
-import com.yongqi.common.core.domain.model.XcxLoginUser;
 import com.yongqi.common.helper.LoginHelper;
+import com.yongqi.common.utils.StringUtils;
 import com.yongqi.system.domain.vo.RouterVo;
 import com.yongqi.system.service.ISysMenuService;
 import com.yongqi.system.service.ISysUserService;
@@ -119,11 +118,16 @@ public class SysLoginController {
     * @return 用户信息
     */
    @GetMapping("getInfo")
-    public R<Map<String, Object>> getInfo() {
+    public R<Map<String, Object>> getInfo(@RequestParam(value = "adminTag", required = false) String adminTag) {
        LoginUser loginUser = LoginHelper.getLoginUser();
-        DbWxUserVo user = wxUserService.queryById(loginUser.getUserId());
        Map<String, Object> ajax = new HashMap<>();
-        ajax.put("user", user);
+        if (StringUtils.isEmpty(adminTag)) {
+            DbWxUserVo user = wxUserService.queryById(loginUser.getUserId());
+            ajax.put("user", user);
+        } else {
+            SysUser user = userService.selectUserById(loginUser.getUserId());
+            ajax.put("user", user);
+        }
        ajax.put("roles", loginUser.getRolePermission());
        ajax.put("permissions", loginUser.getMenuPermission());
        return R.ok(ajax);

--- a/yongqi-admin/src/main/resources/application-dev.yml
+++ b/yongqi-admin/src/main/resources/application-dev.yml
@@ -175,8 +175,7 @@ wx:
    mchKey: fdfgg56hdfgh52sdf35dfgscfg84wsed #微信支付商户密钥
    subAppId: #服务商模式下的子商户公众账号ID
    subMchId: #服务商模式下的子商户号
-    #keyPath: C:\\ProgramData\\certKey\xinrenli\\apiclient_cert:p12  # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    keyPath: /opt/xinrenli/cert/apiclient_cert.p12 #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-extend/yongqi-xxl-job-admin/src/main/resources/application.yml
+++ b/yongqi-extend/yongqi-xxl-job-admin/src/main/resources/application.yml
 --- # server 配置
 server:
-  port: 9300
+  port: 9302
  servlet:
    context-path: /xxl-job-admin
 spring:

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbFileController.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbFileController.java
 package com.yongqi.xinrenli.controller;
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.yongqi.common.annotation.RepeatSubmit;
 import com.yongqi.common.annotation.Log;
+import com.yongqi.common.annotation.RepeatSubmit;
 import com.yongqi.common.core.controller.BaseController;
 import com.yongqi.common.core.domain.PageQuery;
 import com.yongqi.common.core.domain.R;
+import com.yongqi.common.core.page.TableDataInfo;
 import com.yongqi.common.core.validate.AddGroup;
 import com.yongqi.common.core.validate.EditGroup;
 import com.yongqi.common.enums.BusinessType;
 import com.yongqi.common.utils.poi.ExcelUtil;
-import com.yongqi.xinrenli.domain.vo.DbFileVo;
 import com.yongqi.xinrenli.domain.bo.DbFileBo;
+import com.yongqi.xinrenli.domain.vo.DbFileVo;
 import com.yongqi.xinrenli.service.IDbFileService;
-import com.yongqi.common.core.page.TableDataInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
 /**
 * 文件
 *
@@ -120,11 +118,11 @@ public class DbFileController extends BaseController {
     * @return
     */
    @SaCheckPermission("xinrenli:file:upload")
-    @Log(title = "文件", businessType = BusinessType.DELETE)
+    @Log(title = "上传文件", businessType = BusinessType.OTHER)
    @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()) {
@@ -133,9 +131,9 @@ public class DbFileController extends BaseController {
            String OriginalFilename = file.getOriginalFilename();//获取原文件名
            String suffixName = OriginalFilename.substring(OriginalFilename.lastIndexOf("."));//获取文件后缀名
            //重新随机生成名字
-            String filename = UUID.randomUUID().toString() +suffixName;
+            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;
+            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
 package com.yongqi.xinrenli.controller;
-import java.math.BigDecimal;
+import cn.dev33.satoken.annotation.SaCheckPermission;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
 import com.github.binarywang.wxpay.exception.WxPayException;
-import com.yongqi.common.core.domain.model.LoginUser;
-import com.yongqi.common.helper.LoginHelper;
-import com.yongqi.common.utils.ip.AddressUtils;
-import com.yongqi.xinrenli.domain.DbOrder;
-import com.yongqi.xinrenli.domain.bo.DbOrderEditBo;
-import com.yongqi.xinrenli.domain.vo.ReportFormsVo;
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.aspectj.weaver.ast.Var;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.yongqi.common.annotation.RepeatSubmit;
 import com.yongqi.common.annotation.Log;
+import com.yongqi.common.annotation.RepeatSubmit;
 import com.yongqi.common.core.controller.BaseController;
 import com.yongqi.common.core.domain.PageQuery;
 import com.yongqi.common.core.domain.R;
+import com.yongqi.common.core.domain.model.LoginUser;
+import com.yongqi.common.core.page.TableDataInfo;
 import com.yongqi.common.core.validate.AddGroup;
 import com.yongqi.common.core.validate.EditGroup;
 import com.yongqi.common.enums.BusinessType;
+import com.yongqi.common.helper.LoginHelper;
+import com.yongqi.common.utils.ip.AddressUtils;
 import com.yongqi.common.utils.poi.ExcelUtil;
-import com.yongqi.xinrenli.domain.vo.DbOrderVo;
 import com.yongqi.xinrenli.domain.bo.DbOrderBo;
+import com.yongqi.xinrenli.domain.bo.DbOrderEditBo;
+import com.yongqi.xinrenli.domain.vo.DbOrderVo;
+import com.yongqi.xinrenli.domain.vo.ReportFormsVo;
 import com.yongqi.xinrenli.service.IDbOrderService;
-import com.yongqi.common.core.page.TableDataInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 /**
 * 订单
@@ -60,6 +55,7 @@ public class DbOrderController extends BaseController {
    public TableDataInfo<DbOrderVo> list(DbOrderBo bo, PageQuery pageQuery) {
        return iDbOrderService.homeList(bo, pageQuery);
    }
    /**
     * 查询订单列表
     */
@@ -70,6 +66,7 @@ public class DbOrderController extends BaseController {
        bo.setUserId(loginUser.getUserId());
        return iDbOrderService.homeList(bo, pageQuery);
    }
    /**
    @SaCheckPermission("xinrenli:order:listUser")
    @GetMapping("/listUser")
@@ -178,21 +175,22 @@ public class DbOrderController extends BaseController {
    /**
     * 下单
     *
-     * @param orderId  订单id
+     * @param orderId    订单id
-     * @param couponId 优惠券id
+     * @param couponId   优惠券id
+     * @param discountId 折扣id
     * @param request
     * @return
     */
    @SaCheckPermission("xinrenli:order:pay")
    @Log(title = "下单", businessType = BusinessType.OTHER)
    @GetMapping("/orderPay")
-    public R orderPay(@NotNull(message = "主键不能为空") @RequestParam("orderId") Long orderId
+    public R orderPay(@NotNull(message = "订单id不能为空") @RequestParam("orderId") Long orderId
-        ,Long couponId
+        , @RequestParam(value = "couponId", required = false) Long couponId
-        ,Long discountId
+        , @RequestParam(value = "discountId", required = false) Long discountId
        , HttpServletRequest request) {
        LoginUser loginUser = LoginHelper.getLoginUser();
        String ipAddr = AddressUtils.getIpAddr(request);
-        return iDbOrderService.orderPay(orderId, couponId,discountId, loginUser, ipAddr);
+        return iDbOrderService.orderPay(orderId, couponId, discountId, loginUser, ipAddr);
    }
    /**

--- 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
 package com.yongqi.xinrenli.domain.bo;
-import com.alibaba.excel.annotation.ExcelProperty;
+import com.yongqi.common.core.domain.BaseEntity;
 import com.yongqi.common.core.validate.AddGroup;
 import com.yongqi.common.core.validate.EditGroup;
-import com.yongqi.xinrenli.domain.vo.DbFileVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
-import java.util.Date;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
-import com.yongqi.common.core.domain.BaseEntity;
 /**
 * 订单业务对象 db_order
 *

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