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 {
@RequestMapping(params = "method=ufo.order.offlinePayment")
public ApiResponse offlinePayment(@RequestParam(name = "uid") Integer uid,
@RequestParam(name = "skup") Integer skup,
@RequestParam(name = "store_id") Integer storeId){
@RequestParam(name = "store_id") Integer storeId,
@RequestParam(value = "business_client", required = false,defaultValue = "ufo") String businessClient){
OfflineShoppingRequest req = new OfflineShoppingRequest();
req.setUid(uid);
req.setSkup(skup);
req.setStoreId(storeId);
req.setBusinessClient(businessClient);
logger.info("in ufo.order.offlinePayment, req {}", req);
OfflinePaymentResponse paymentResponse = offlineShoppingService.offlinePayment(req);
return new ApiResponse.ApiResponseBuilder().code(200).data(paymentResponse).build();
... ... @@ -50,12 +52,14 @@ public class OfflineShoppingController {
@RequestMapping(params = "method=ufo.order.offlineCompute")
public ApiResponse offlineCompute(@RequestParam(name = "uid") Integer uid,
@RequestParam(name = "skup") Integer skup,
@RequestParam(name = "coupon_code",required = false) String couponCode) {
@RequestParam(name = "coupon_code",required = false) String couponCode,
@RequestParam(value = "business_client", required = false,defaultValue = "ufo") String businessClient) {
OfflineShoppingRequest req = new OfflineShoppingRequest();
req.setUid(uid);
req.setSkup(skup);
req.setCouponCodes(CouponCodeUtils.asList(couponCode));
req.setBusinessClient(businessClient);
logger.info("in ufo.order.offlineCompute, req {}", req);
ComputeResponse resp = offlineShoppingService.offlineCompute(req);
... ... @@ -74,7 +78,8 @@ public class OfflineShoppingController {
@RequestParam(name = "store_id") Integer storeId,
@RequestParam(name = "user_longitude") Double userLongitude,
@RequestParam(name = "user_latitude") Double userLatitude,
@RequestParam(name = "client_type", required = false) String clientType){
@RequestParam(name = "client_type", required = false) String clientType,
@RequestParam(value = "business_client", required = false,defaultValue = "ufo") String businessClient){
if(StringUtils.isBlank(channelNo)){
channelNo = "2919";
}
... ... @@ -89,6 +94,7 @@ public class OfflineShoppingController {
request.setUserLongitude(userLongitude);
request.setUserLatitude(userLatitude);
request.setClientType(clientType);
request.setBusinessClient(businessClient);
logger.info("in ufo.order.offlineSubmit, req {}", request);
OrderSubmitResponse submitResponse = offlineShoppingService.offlineSubmit(request);
... ...