|
@@ -62,21 +62,21 @@ public class PayOrderController {
|
|
payOrder.setConsumer(appUserInfoList.get(0).getBlogNickName()); //昵称
|
|
payOrder.setConsumer(appUserInfoList.get(0).getBlogNickName()); //昵称
|
|
payOrder.setConsumerId(appUserInfoList.get(0).getUserId()); //用户id
|
|
payOrder.setConsumerId(appUserInfoList.get(0).getUserId()); //用户id
|
|
//添加订单信息,返回订单号
|
|
//添加订单信息,返回订单号
|
|
-// String ordNo =payOrderService.AddPayOrderInfo(payOrderRequest, payOrder);
|
|
|
|
-// if(ordNo.equals("0")){
|
|
|
|
-// resultData=ResultData.error(CodeMsg.CHECK_DATA);
|
|
|
|
-// }else if(ordNo.equals("1")){
|
|
|
|
-// resultData=ResultData.error(CodeMsg.PARAMS_NUll);
|
|
|
|
-// }else {
|
|
|
|
-// resultData=ResultData.success(ordNo);
|
|
|
|
-// }
|
|
|
|
- //接口修订
|
|
|
|
- Map<String, Object> stringObjectMap = payOrderService.AddPayOrderInfoNew(payOrderRequest, payOrder);
|
|
|
|
- if(stringObjectMap.containsKey("balanceNoEnough")){
|
|
|
|
- resultData=ResultData.error(CodeMsg.BALANCE_NOT_EENOUGH);
|
|
|
|
|
|
+ String ordNo =payOrderService.AddPayOrderInfo(payOrderRequest, payOrder);
|
|
|
|
+ if(ordNo.equals("0")){
|
|
|
|
+ resultData=ResultData.error(CodeMsg.CHECK_DATA);
|
|
|
|
+ }else if(ordNo.equals("1")){
|
|
|
|
+ resultData=ResultData.error(CodeMsg.PARAMS_NUll);
|
|
}else {
|
|
}else {
|
|
- resultData = ResultData.success(stringObjectMap);
|
|
|
|
|
|
+ resultData=ResultData.success(ordNo);
|
|
}
|
|
}
|
|
|
|
+ //接口修订
|
|
|
|
+// Map<String, Object> stringObjectMap = payOrderService.AddPayOrderInfoNew(payOrderRequest, payOrder);
|
|
|
|
+// if(stringObjectMap.containsKey("balanceNoEnough")){
|
|
|
|
+// resultData=ResultData.error(CodeMsg.BALANCE_NOT_EENOUGH);
|
|
|
|
+// }else {
|
|
|
|
+// resultData = ResultData.success(stringObjectMap);
|
|
|
|
+// }
|
|
}else{
|
|
}else{
|
|
//登录人验证失败
|
|
//登录人验证失败
|
|
resultData=ResultData.error(CodeMsg.USER_NOT_EXSIST);
|
|
resultData=ResultData.error(CodeMsg.USER_NOT_EXSIST);
|