From a39422f2a8ce45dd6cf65701ed5f9e65391c46c1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 11:03:35 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
index 20ed310..f6bbfca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
@@ -280,15 +280,19 @@
* @param out
*/
@RequestMapping(value = "useRewardCoupon", method = RequestMethod.POST)
- public void useRewardCoupon(AcceptData acceptData, Long uid, Long cid, String orderNo, PrintWriter out) {
+ public void useRewardCoupon(AcceptData acceptData, Long uid, Long cid, String orderNo, Integer goodsType, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
+ if (goodsType == null || goodsType > 3 || goodsType < 1) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
try {
- UserSystemCouponService.useOrderCoupon(uid, cid, orderNo);
+ UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType);
JSONObject data = commonOrderService.getRewardJumpInfo(orderNo);
--
Gitblit v1.8.0