ufo / yohoufo-fore · Commits

Go to a project

Authored by chenjian
Commit 2e58b8dea8159b6625ca8c1a29e336f41ef24630 1 parent 99957627

线下店接口支持促销

Inline Side-by-side
Showing 1 changed file with 4 additions and 0 deletions
@@ -53,12 +53,14 @@ public class OfflineShoppingController { @@ -53,12 +53,14 @@ public class OfflineShoppingController {
53 public ApiResponse offlineCompute(@RequestParam(name = "uid") Integer uid, 53 public ApiResponse offlineCompute(@RequestParam(name = "uid") Integer uid,
54 @RequestParam(name = "skup") Integer skup, 54 @RequestParam(name = "skup") Integer skup,
55 @RequestParam(name = "coupon_code",required = false) String couponCode, 55 @RequestParam(name = "coupon_code",required = false) String couponCode,
  56 + @RequestParam(name="promotionId", required = false)Integer promotionId,
56 @RequestParam(value = "business_client", required = false,defaultValue = "ufo") String businessClient) { 57 @RequestParam(value = "business_client", required = false,defaultValue = "ufo") String businessClient) {
57 58
58 OfflineShoppingRequest req = new OfflineShoppingRequest(); 59 OfflineShoppingRequest req = new OfflineShoppingRequest();
59 req.setUid(uid); 60 req.setUid(uid);
60 req.setSkup(skup); 61 req.setSkup(skup);
61 req.setCouponCodes(CouponCodeUtils.asList(couponCode)); 62 req.setCouponCodes(CouponCodeUtils.asList(couponCode));
  63 + req.setPromotionId(promotionId);
62 req.setBusinessClient(businessClient); 64 req.setBusinessClient(businessClient);
63 65
64 logger.info("in ufo.order.offlineCompute, req {}", req); 66 logger.info("in ufo.order.offlineCompute, req {}", req);
@@ -74,6 +76,7 @@ public class OfflineShoppingController { @@ -74,6 +76,7 @@ public class OfflineShoppingController {
74 public ApiResponse offlineSubmit(@RequestParam(name = "uid") Integer uid, 76 public ApiResponse offlineSubmit(@RequestParam(name = "uid") Integer uid,
75 @RequestParam(name = "skup") Integer skup, 77 @RequestParam(name = "skup") Integer skup,
76 @RequestParam(name = "coupon_code",required = false) String couponCode, 78 @RequestParam(name = "coupon_code",required = false) String couponCode,
  79 + @RequestParam(name="promotionId", required = false)Integer promotionId,
77 @RequestParam(name = "channelNo", required = false) String channelNo, 80 @RequestParam(name = "channelNo", required = false) String channelNo,
78 @RequestParam(name = "store_id") Integer storeId, 81 @RequestParam(name = "store_id") Integer storeId,
79 @RequestParam(name = "user_longitude") Double userLongitude, 82 @RequestParam(name = "user_longitude") Double userLongitude,
@@ -88,6 +91,7 @@ public class OfflineShoppingController { @@ -88,6 +91,7 @@ public class OfflineShoppingController {
88 request.setUid(uid); 91 request.setUid(uid);
89 request.setSkup(skup); 92 request.setSkup(skup);
90 request.setCouponCodes(CouponCodeUtils.asList(couponCode)); 93 request.setCouponCodes(CouponCodeUtils.asList(couponCode));
  94 + request.setPromotionId(promotionId);
91 request.setChannelNo(channelNo); 95 request.setChannelNo(channelNo);
92 request.setAddressId("0"); //门店自提，不需addressId 96 request.setAddressId("0"); //门店自提，不需addressId
93 request.setStoreId(storeId); 97 request.setStoreId(storeId);