|
@@ -614,7 +614,11 @@ public class TPromoCodeController {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
Float discount = promoCode.getDiscount();
|
|
Float discount = promoCode.getDiscount();
|
|
- return JsonMessage.success(discount);
|
|
|
|
|
|
+ String type = promoCode.getType();
|
|
|
|
+ JSONObject kindData = new JSONObject();
|
|
|
|
+ kindData.put("type", type.equals("1") ? type : "0");
|
|
|
|
+ kindData.put("discount", discount);
|
|
|
|
+ return JsonMessage.success(kindData.toString());
|
|
}else{
|
|
}else{
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|