From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/common/actions/TestActionBB.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/TestActionBB.java b/zq-erp/src/main/java/com/matrix/system/common/actions/TestActionBB.java
index f0213df..b4b02ed 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/TestActionBB.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/TestActionBB.java
@@ -2,11 +2,11 @@
import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.tools.UUIDUtil;
import com.matrix.core.web.BaseAction;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -21,10 +21,10 @@
WeixinServiceUtil weixinServiceUtil;
- @GetMapping(value = "/testPay")
+ @GetMapping(value = "/testPay/{no}")
@ResponseBody
- public AjaxResult hiveMobileLoginOut() {
- weixinServiceUtil.comPay("提现", UUIDUtil.getRandomID(),1,"oJkRK4yelehsY4S7I6Ee1ydWtQMI",36L);
+ public AjaxResult hiveMobileLoginOut(@PathVariable String no) {
+ weixinServiceUtil.comPay("提现", no,1,"oJkRK4yelehsY4S7I6Ee1ydWtQMI",36L);
return AjaxResult.buildSuccessInstance("");
}
--
Gitblit v1.9.1