|
@@ -138,47 +138,27 @@ public class APIController extends BaseController {
|
|
|
// 商城创建订单
|
|
|
@PostMapping("/mallCreateOrder")
|
|
|
public HttpResponseResult<Map> mallCreateOrder(@RequestBody MallCreateOrderModel model) {
|
|
|
- try {
|
|
|
- return succeed(studentPaymentOrderService.createOrder(model));
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return failed();
|
|
|
- }
|
|
|
+ return succeed(studentPaymentOrderService.createOrder(model));
|
|
|
}
|
|
|
|
|
|
// 商城订单优惠券金额
|
|
|
@PostMapping("/couponAmount")
|
|
|
public HttpResponseResult<Map> couponAmount(@RequestBody MallCreateOrderModel model) {
|
|
|
- try {
|
|
|
return succeed(studentPaymentOrderService.couponAmount(model));
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return failed();
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
// 商城保存订单详情数据
|
|
|
@PostMapping("/mallSaveOrderInfo")
|
|
|
public HttpResponseResult<Map> mallSaveOrderInfo(@RequestBody MallCreateOrderModel model) {
|
|
|
- try {
|
|
|
studentPaymentOrderService.mallSaveOrderInfo(model);
|
|
|
return succeed();
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return failed();
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
// 商城支付成功/失败修改订单状态
|
|
|
@PostMapping("/updateOrder")
|
|
|
- public HttpResponseResult updateOrder(@RequestBody Map map) {
|
|
|
+ public HttpResponseResult updateOrder(@RequestBody Map map) throws Exception {
|
|
|
|
|
|
- try {
|
|
|
- studentPaymentOrderService.updateOrder(map);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return failed();
|
|
|
- }
|
|
|
+ studentPaymentOrderService.updateOrder(map);
|
|
|
return succeed();
|
|
|
}
|
|
|
|
|
@@ -190,20 +170,15 @@ public class APIController extends BaseController {
|
|
|
@PostMapping("/cancelOrder")
|
|
|
public HttpResponseResult<OrderCancelModel> cancelOrder(@RequestParam String orderNo) {
|
|
|
|
|
|
- try {
|
|
|
- OrderCancelModel cancelModel = new OrderCancelModel();
|
|
|
- StudentPaymentOrder orderByOrderNo = studentPaymentOrderService.findOrderByOrderNo(orderNo);
|
|
|
- if (orderByOrderNo == null) {
|
|
|
- cancelModel.setSuccess(true);
|
|
|
- cancelModel.setStatus(false);
|
|
|
- return succeed(cancelModel);
|
|
|
- }
|
|
|
- cancelModel = studentPaymentOrderService.cancelOrder(orderByOrderNo);
|
|
|
+ OrderCancelModel cancelModel = new OrderCancelModel();
|
|
|
+ StudentPaymentOrder orderByOrderNo = studentPaymentOrderService.findOrderByOrderNo(orderNo);
|
|
|
+ if (orderByOrderNo == null) {
|
|
|
+ cancelModel.setSuccess(true);
|
|
|
+ cancelModel.setStatus(false);
|
|
|
return succeed(cancelModel);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return failed();
|
|
|
}
|
|
|
+ cancelModel = studentPaymentOrderService.cancelOrder(orderByOrderNo);
|
|
|
+ return succeed(cancelModel);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -211,18 +186,13 @@ public class APIController extends BaseController {
|
|
|
@GetMapping("/getRefundInfo")
|
|
|
public HttpResponseResult<Map<String,String>> getBaseUrl(@RequestParam String orderNo) {
|
|
|
|
|
|
- try {
|
|
|
- SysConfig baseApiUrl = sysConfigService.findByParamName("base_api_url");
|
|
|
- StudentPaymentOrder orderByOrderNo = studentPaymentOrderService.findOrderByOrderNo(orderNo);
|
|
|
- Map<String,String> result = new HashMap<>();
|
|
|
- result.put("transNo",orderByOrderNo.getTransNo());
|
|
|
- result.put("baseUrl",baseApiUrl.getParanValue());
|
|
|
- ;
|
|
|
- return succeed(result);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return failed();
|
|
|
- }
|
|
|
+ SysConfig baseApiUrl = sysConfigService.findByParamName("base_api_url");
|
|
|
+ StudentPaymentOrder orderByOrderNo = studentPaymentOrderService.findOrderByOrderNo(orderNo);
|
|
|
+ Map<String,String> result = new HashMap<>();
|
|
|
+ result.put("transNo",orderByOrderNo.getTransNo());
|
|
|
+ result.put("baseUrl",baseApiUrl.getParanValue());
|
|
|
+ ;
|
|
|
+ return succeed(result);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -231,14 +201,9 @@ public class APIController extends BaseController {
|
|
|
@PostMapping("/refund")
|
|
|
public HttpResponseResult<BaseResult<Map<String, Object>>> refund(@RequestBody RefundModel refundModel) {
|
|
|
|
|
|
- try {
|
|
|
- BaseResult<Map<String, Object>> mapBaseResult = studentPaymentOrderService.refund(refundModel.getOrderNo(),refundModel.getNotifyUrl(),refundModel.getRefundNo());
|
|
|
+ BaseResult<Map<String, Object>> mapBaseResult = studentPaymentOrderService.refund(refundModel.getOrderNo(),refundModel.getNotifyUrl(),refundModel.getRefundNo());
|
|
|
|
|
|
- return succeed(mapBaseResult);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return failed();
|
|
|
- }
|
|
|
+ return succeed(mapBaseResult);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -247,14 +212,9 @@ public class APIController extends BaseController {
|
|
|
@PostMapping("/receive")
|
|
|
public HttpResponseResult receive(@RequestParam String orderNo,@RequestParam boolean autoReceive) {
|
|
|
|
|
|
- try {
|
|
|
- studentPaymentOrderService.receive(orderNo,autoReceive);
|
|
|
+ studentPaymentOrderService.receive(orderNo,autoReceive);
|
|
|
|
|
|
- return succeed();
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return failed();
|
|
|
- }
|
|
|
+ return succeed();
|
|
|
}
|
|
|
|
|
|
|
|
@@ -263,13 +223,8 @@ public class APIController extends BaseController {
|
|
|
@PostMapping("/balance")
|
|
|
public HttpResponseResult<BigDecimal> balance(@RequestParam Long userId) {
|
|
|
|
|
|
- try {
|
|
|
- BigDecimal balance = studentPaymentOrderService.balance(userId);
|
|
|
+ BigDecimal balance = studentPaymentOrderService.balance(userId);
|
|
|
|
|
|
- return succeed(balance);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return failed();
|
|
|
- }
|
|
|
+ return succeed(balance);
|
|
|
}
|
|
|
}
|