ufo / yohoufo-fore · Commits

Go to a project

Authored by chenjian
Commit 0f79e59d1af31115bf9a6d8996ca9724e855d028 2 parents ded7c4c0 99957627

Merge branch 'hotfix-bid-seller-cache' into test6.9.14

Inline Side-by-side
Showing 1 changed file with 9 additions and 3 deletions
@@ -31,11 +31,13 @@ public class OfflineShoppingController { @@ -31,11 +31,13 @@ public class OfflineShoppingController {
31 @RequestMapping(params = "method=ufo.order.offlinePayment") 31 @RequestMapping(params = "method=ufo.order.offlinePayment")
32 public ApiResponse offlinePayment(@RequestParam(name = "uid") Integer uid, 32 public ApiResponse offlinePayment(@RequestParam(name = "uid") Integer uid,
33 @RequestParam(name = "skup") Integer skup, 33 @RequestParam(name = "skup") Integer skup,
34 - @RequestParam(name = "store_id") Integer storeId){ 34 + @RequestParam(name = "store_id") Integer storeId,
  35 + @RequestParam(value = "business_client", required = false,defaultValue = "ufo") String businessClient){
35 OfflineShoppingRequest req = new OfflineShoppingRequest(); 36 OfflineShoppingRequest req = new OfflineShoppingRequest();
36 req.setUid(uid); 37 req.setUid(uid);
37 req.setSkup(skup); 38 req.setSkup(skup);
38 req.setStoreId(storeId); 39 req.setStoreId(storeId);
  40 + req.setBusinessClient(businessClient);
39 logger.info("in ufo.order.offlinePayment, req {}", req); 41 logger.info("in ufo.order.offlinePayment, req {}", req);
40 OfflinePaymentResponse paymentResponse = offlineShoppingService.offlinePayment(req); 42 OfflinePaymentResponse paymentResponse = offlineShoppingService.offlinePayment(req);
41 return new ApiResponse.ApiResponseBuilder().code(200).data(paymentResponse).build(); 43 return new ApiResponse.ApiResponseBuilder().code(200).data(paymentResponse).build();
@@ -50,12 +52,14 @@ public class OfflineShoppingController { @@ -50,12 +52,14 @@ public class OfflineShoppingController {
50 @RequestMapping(params = "method=ufo.order.offlineCompute") 52 @RequestMapping(params = "method=ufo.order.offlineCompute")
51 public ApiResponse offlineCompute(@RequestParam(name = "uid") Integer uid, 53 public ApiResponse offlineCompute(@RequestParam(name = "uid") Integer uid,
52 @RequestParam(name = "skup") Integer skup, 54 @RequestParam(name = "skup") Integer skup,
53 - @RequestParam(name = "coupon_code",required = false) String couponCode) { 55 + @RequestParam(name = "coupon_code",required = false) String couponCode,
  56 + @RequestParam(value = "business_client", required = false,defaultValue = "ufo") String businessClient) {
54 57
55 OfflineShoppingRequest req = new OfflineShoppingRequest(); 58 OfflineShoppingRequest req = new OfflineShoppingRequest();
56 req.setUid(uid); 59 req.setUid(uid);
57 req.setSkup(skup); 60 req.setSkup(skup);
58 req.setCouponCodes(CouponCodeUtils.asList(couponCode)); 61 req.setCouponCodes(CouponCodeUtils.asList(couponCode));
  62 + req.setBusinessClient(businessClient);
59 63
60 logger.info("in ufo.order.offlineCompute, req {}", req); 64 logger.info("in ufo.order.offlineCompute, req {}", req);
61 ComputeResponse resp = offlineShoppingService.offlineCompute(req); 65 ComputeResponse resp = offlineShoppingService.offlineCompute(req);
@@ -74,7 +78,8 @@ public class OfflineShoppingController { @@ -74,7 +78,8 @@ public class OfflineShoppingController {
74 @RequestParam(name = "store_id") Integer storeId, 78 @RequestParam(name = "store_id") Integer storeId,
75 @RequestParam(name = "user_longitude") Double userLongitude, 79 @RequestParam(name = "user_longitude") Double userLongitude,
76 @RequestParam(name = "user_latitude") Double userLatitude, 80 @RequestParam(name = "user_latitude") Double userLatitude,
77 - @RequestParam(name = "client_type", required = false) String clientType){ 81 + @RequestParam(name = "client_type", required = false) String clientType,
  82 + @RequestParam(value = "business_client", required = false,defaultValue = "ufo") String businessClient){
78 if(StringUtils.isBlank(channelNo)){ 83 if(StringUtils.isBlank(channelNo)){
79 channelNo = "2919"; 84 channelNo = "2919";
80 } 85 }
@@ -89,6 +94,7 @@ public class OfflineShoppingController { @@ -89,6 +94,7 @@ public class OfflineShoppingController {
89 request.setUserLongitude(userLongitude); 94 request.setUserLongitude(userLongitude);
90 request.setUserLatitude(userLatitude); 95 request.setUserLatitude(userLatitude);
91 request.setClientType(clientType); 96 request.setClientType(clientType);
  97 + request.setBusinessClient(businessClient);
92 98
93 logger.info("in ufo.order.offlineSubmit, req {}", request); 99 logger.info("in ufo.order.offlineSubmit, req {}", request);
94 OrderSubmitResponse submitResponse = offlineShoppingService.offlineSubmit(request); 100 OrderSubmitResponse submitResponse = offlineShoppingService.offlineSubmit(request);