Просмотр исходного кода

[未支付订单][修改]:返回c端未支付订单信息

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
96a9890954
2 измененных файлов: 18 добавлений и 20 удалений
  1. +17
    -19
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 17
- 19
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Просмотреть файл

@@ -270,21 +270,20 @@ public class WxOrderController extends BaseController {


@ApiOperation(value = "根据orderId查询接口", notes = "{\"orderId\":\"string\"}") @ApiOperation(value = "根据orderId查询接口", notes = "{\"orderId\":\"string\"}")
@GetMapping("/findById") @GetMapping("/findById")
public ResultData findById(@RequestBody Map<String, String> paramMap) {
String orderIdStr = paramMap.get("orderId");
if (StringUtils.isBlank(orderIdStr)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空");
}
Long orderId = 0L;
@ApiImplicitParams({
@ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", paramType = "query", required = true)
})
public ResultData findById(String orderId) {
Long id = 0L;
try { try {
orderId = Long.valueOf(orderIdStr);
id = Long.valueOf(orderId);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
logger.error("parse orderId failed"); logger.error("parse orderId failed");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常");
} }
WxOrder order = null; WxOrder order = null;
try { try {
order = wxOrderService.getById(orderId);
order = wxOrderService.getById(id);
if (order != null) { if (order != null) {
return new ResultData(Result.SUCCESS, "查询成功", order); return new ResultData(Result.SUCCESS, "查询成功", order);
} else { } else {
@@ -297,28 +296,27 @@ public class WxOrderController extends BaseController {
} }


@ApiOperation(value = "获取未支付订单", notes = "{\"couponId\":\"string\"}") @ApiOperation(value = "获取未支付订单", notes = "{\"couponId\":\"string\"}")
@GetMapping("/getUnPaidOrder")
public ResultData getUnPaidOrder(@RequestBody Map<String, String> paramMap) {
String couponIdStr = paramMap.get("couponId");
if (StringUtils.isBlank(couponIdStr)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空");
}
Long couponId = 0L;
@GetMapping("getUnPaidOrder")
@ApiImplicitParams({
@ApiImplicitParam(name = "couponId", value = "券id", dataType = "String", paramType = "query", required = true)
})
public ResultData getUnPaidOrder(String couponId) {
Long id = 0L;
try { try {
couponId = Long.valueOf(couponIdStr);
id = Long.valueOf(couponId);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
logger.error("parse couponId failed"); logger.error("parse couponId failed");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券ID转换异常"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券ID转换异常");
} }
WxCoupon wxCoupon = null; WxCoupon wxCoupon = null;
try { try {
wxCoupon = wxCouponService.getById(couponId);
wxCoupon = wxCouponService.getById(id);
} catch (Exception e) { } catch (Exception e) {
logger.error("券ID获取券信息失败, couponId: " + couponIdStr);
logger.error("券ID获取券信息失败, couponId: " + couponId);
return new ResultData(ErrorCode.COUPON_IS_EMPTY); return new ResultData(ErrorCode.COUPON_IS_EMPTY);
} }
if(wxCoupon == null) { if(wxCoupon == null) {
logger.error("券ID获取券信息失败, couponId: " + couponIdStr);
logger.error("券ID获取券信息失败, couponId: " + couponId);
return new ResultData(ErrorCode.COUPON_IS_EMPTY); return new ResultData(ErrorCode.COUPON_IS_EMPTY);
} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -238,7 +238,7 @@ public class WxOrderServiceImpl implements WxOrderService {
statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode());
orderQ.setStatusS(statusS); orderQ.setStatusS(statusS);
List<WxOrder> orders = wxOrderMapper.findList(orderQ); List<WxOrder> orders = wxOrderMapper.findList(orderQ);
if(orders.size() > 1) {
if(orders.size() >= 1) {
return orders.get(0); return orders.get(0);
} }
} catch (Exception e) { } catch (Exception e) {


Загрузка…
Отмена
Сохранить