commit

configure/dev/application.properties

@@ -29,14 +29,14 @@ spring.redis.timeout=0
 system.name = fuint餐饮会员系统
 
 # 前端h5地址
-website.url=https://www.fuint.cn/h5/
+website.url=https://home.ynims.com:8881/
 
 # 上传图片本地地址
 images.root=E:/ideaWorkspace/fuintBackend/fuint-application/target/classes
 images.path=/static/uploadImages/
 
 # 上传图片服务器域名
-images.upload.url=http://localhost:8080
+images.upload.url=https://home.ynims.com:8881
 
 # 上传图片允许的大小（单位：MB）
 images.upload.maxSize=5
@@ -92,7 +92,7 @@ wxpay.appSecret=76a538bfa5b55a72de6214d5f0be5540
 wxpay.mchId=1636980848
 wxpay.apiV2=fuyuan20201030yanhe9999999999999
 wxpay.certPath=/usr/local/fuint/cert/apiclient_cert.p12
-wxpay.domain=https://www.fuint.cn/fuint-food
+wxpay.domain=https://home.ynims.com:8881
 
 ################## 支付宝支付相关配置 ######################
 alipay.appId = 应用编号

configure/prod/application.properties

@@ -29,14 +29,14 @@ spring.redis.timeout=0
 system.name = fuint餐饮会员系统
 
 # 前端h5地址
-website.url=https://www.fuint.cn/h5/
+website.url=https://home.ynims.com:8881/
 
 # 上传图片本地地址
 images.root=/work/projects/funit
 images.path=/static/uploadImages/
 
 # 上传图片服务器域名
-images.upload.url=http://localhost:8080
+images.upload.url=https://home.ynims.com:8881
 
 # 上传图片允许的大小（单位：MB）
 images.upload.maxSize=5
@@ -87,12 +87,12 @@ weixin.official.appId=wxf4327ef05c27a0
 weixin.official.appSecret=1f55e8749332234d9a074873d8e6a3
 
 # 小程序配置
-wxpay.appId = wxb6af3741234162bc
-wxpay.appSecret = 76a538bfa5b55a4564d5f2be5540
+wxpay.appId = wx602c7b6f1f00558f
+wxpay.appSecret = 3944d660349e35300800decb187cb4f8
 wxpay.mchId=1636980812
 wxpay.apiV2=34354320201030y323e432342343
 wxpay.certPath=/usr/local/fuint/cert/apiclient_cert.p12
-wxpay.domain=https://www.fuint.cn/fuint-food
+wxpay.domain=https://home.ynims.com:8881
 
 ################## 支付宝支付相关配置 ######################
 alipay.appId = 应用编号

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

@@ -62,15 +62,15 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
                  ids.add(tDuty.getDutyId().longValue());
             }
         }
-        List<Long> roleIds = findDutiesByAccountId(accountId);
-        if (roleIds.size() > 0) {
-            for (Long roleId : roleIds) {
-                if (!ids.contains(roleId)) {
-                    TDuty duty = getRoleById(roleId);
-                    result.add(duty);
-                }
-            }
-        }
+//        List<Long> roleIds = findDutiesByAccountId(accountId);
+//        if (roleIds.size() > 0) {
+//            for (Long roleId : roleIds) {
+//                if (!ids.contains(roleId)) {
+//                    TDuty duty = getRoleById(roleId);
+//                    result.add(duty);
+//                }
+//            }
+//        }
         return result;
     }
 
@@ -251,7 +251,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
         String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
         if (StringUtils.isNotBlank(merchantId)) {
             lambdaQueryWrapper.and(wq -> wq
-                    .eq(TDuty::getMerchantId, 0)
+//                    .eq(TDuty::getMerchantId, 0)
                     .or()
                     .eq(TDuty::getMerchantId, merchantId));
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/common/BackendCommonController.java

@@ -106,6 +106,7 @@ public class BackendCommonController extends BaseController {
 
         String h5QrCode = "";
         String h5Page = env.getProperty("website.url") + "#" + page;
+        logger.info("h5Page:{}",h5Page);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         QRCodeUtil.createQrCode(out, h5Page, 800, 800, "png", "");
         h5QrCode = new String(Base64Util.baseEncode(out.toByteArray()), "UTF-8");

fuint-application/src/main/java/com/fuint/module/backendApi/controller/member/BackendMemberGroupController.java

@@ -118,7 +118,8 @@ public class BackendMemberGroupController extends BaseController {
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('member:group:index')")
     public ResponseObject delete(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(request.getHeader("merchantNo"));
+//        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(request.getHeader("merchantNo"));
+        AccountInfo accountInfo = TokenUtil.getAccountInfo();
 
         // 该分组已有会员，不允许删除
         Map<String, Object> searchParams = new HashMap<>();

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

@@ -237,6 +237,7 @@ public class BackendOrderController extends BaseController {
         }
         if (StringUtil.isNotEmpty(amount)) {
             orderDto.setAmount(new BigDecimal(amount));
+            orderDto.setPayAmount(new BigDecimal(amount));
         }
         if (StringUtil.isNotEmpty(discount)) {
             orderDto.setDiscount(new BigDecimal(discount));

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

@@ -1,9 +1,12 @@
 # 基本配置
-server.port=8881
-#env.profile=prod
-#env.properties.path=/work/projects/funit/configure/
-env.profile=dev
-env.properties.path=E:/ideaWorkspace/fuintBackend/configure/
+server.port=18881
+env.profile=prod
+# env.properties.path 使用相对路径，基于启动进程的工作目录(user.dir)解析：
+#   生产环境：启动脚本先 cd 到 jar 所在目录（如 /work/projects/funit）再启动，即对应 /work/projects/funit/configure/；
+#   开发环境：IDE 运行时工作目录默认为工程根目录，configure 目录正好位于其下。
+# 因此 dev/prod 统一写 configure/，打包产物不再包含任何机器的绝对路径。
+env.properties.path=configure/
+#env.profile=dev
 
 # 数据库配置
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource