...
|
...
|
@@ -42,7 +42,7 @@ public class ShoppingController { |
|
|
//接口版本,控制不同的动作
|
|
|
@RequestParam(name = "api_version", required = false, defaultValue = "0") int apiVersion,
|
|
|
@RequestParam(value = "app_version", required = false)String appVersion,
|
|
|
@RequestParam(value = "business_client", required = false) String businessClient){
|
|
|
@RequestParam(value = "business_client", required = false,defaultValue = "ufo") String businessClient){
|
|
|
|
|
|
//活动类型
|
|
|
ActivityTypeEnum activityTypeEnum = ActivityTypeEnum.find(activityType);
|
...
|
...
|
@@ -75,7 +75,7 @@ public class ShoppingController { |
|
|
@RequestParam(name = "addressId", required = false) String addressId,
|
|
|
@RequestParam(name = "coupon_code",required = false) String couponCode,
|
|
|
@RequestParam(name="depositRequirement", required = false, defaultValue = OrderConstant.N_STR)String depositRequirement,
|
|
|
@RequestParam(value = "business_client", required = false) String businessClient) {
|
|
|
@RequestParam(value = "business_client", required = false, defaultValue = "ufo") String businessClient) {
|
|
|
//活动类型
|
|
|
ActivityTypeEnum activityTypeEnum = ActivityTypeEnum.find(0);
|
|
|
|
...
|
...
|
@@ -109,7 +109,7 @@ public class ShoppingController { |
|
|
//接口版本,控制不同的动作
|
|
|
@RequestParam(name = "api_version", required = false, defaultValue = "0") int apiVersion,
|
|
|
@RequestParam(value = "app_version", required = false)String appVersion,
|
|
|
@RequestParam(value = "business_client", required = false) String businessClient) {
|
|
|
@RequestParam(value = "business_client", required = false, defaultValue = "ufo") String businessClient) {
|
|
|
|
|
|
//活动类型
|
|
|
ActivityTypeEnum activityTypeEnum = ActivityTypeEnum.find(activityType);
|
...
|
...
|
@@ -147,7 +147,7 @@ public class ShoppingController { |
|
|
@RequestParam(name="depositRequirement", required = false, defaultValue = OrderConstant.N_STR)String depositRequirement,
|
|
|
@RequestParam(name="promotionId", required = false)Integer promotionId,
|
|
|
@RequestParam(name = "client_type", required = false) String clientType,
|
|
|
@RequestParam(name="business_client", required = false)String businessClient){
|
|
|
@RequestParam(name="business_client", required = false, defaultValue = "ufo")String businessClient){
|
|
|
if(StringUtils.isBlank(channelNo)){
|
|
|
channelNo = "2919";
|
|
|
}
|
...
|
...
|
@@ -183,7 +183,7 @@ public class ShoppingController { |
|
|
@RequestParam(name = "skup") int skup,
|
|
|
@RequestParam(name = "addressId") String addressId,
|
|
|
@RequestParam(name="depositRequirement", defaultValue = OrderConstant.N_STR)String depositRequirement,
|
|
|
@RequestParam(value = "business_client", required = false) String businessClient) {
|
|
|
@RequestParam(value = "business_client", required = false, defaultValue = "ufo") String businessClient) {
|
|
|
//活动类型
|
|
|
ActivityTypeEnum activityTypeEnum = ActivityTypeEnum.COMMON;
|
|
|
ShoppingRequest req = ShoppingRequest.builder()
|
...
|
...
|
|