| @@ -161,7 +161,7 @@ public class WxOrderController extends BaseController { | |||
| orderId = Long.valueOf(orderIdStr); | |||
| } catch (NumberFormatException e) { | |||
| logger.error(e.getMessage()); | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "退款订单ID转换失败"); | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "退款订单ID转换失败:"+orderIdStr); | |||
| } | |||
| try { | |||
| WxOrder order = wxOrderService.getById(orderId,getTenantInfo().getTenantId()); | |||
| @@ -229,7 +229,7 @@ public class WxOrderController extends BaseController { | |||
| id = Long.valueOf(orderId); | |||
| } catch (NumberFormatException e) { | |||
| 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转换异常:"+orderId); | |||
| } | |||
| wxOrder.setId(id); | |||
| Long memberId; | |||
| @@ -285,7 +285,7 @@ public class WxOrderController extends BaseController { | |||
| id = Long.valueOf(orderId); | |||
| } catch (NumberFormatException e) { | |||
| 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转换异常:"+orderId); | |||
| } | |||
| WxOrder order = null; | |||
| try { | |||
| @@ -315,7 +315,7 @@ public class WxOrderController extends BaseController { | |||
| id = Long.valueOf(couponId); | |||
| } catch (NumberFormatException e) { | |||
| 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转换异常:"+couponId); | |||
| } | |||
| WxCoupon wxCoupon = null; | |||
| try { | |||
| @@ -384,7 +384,7 @@ public class WxOrderController extends BaseController { | |||
| id = Long.valueOf(orderId); | |||
| } catch (NumberFormatException e) { | |||
| 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转换异常:"+orderId); | |||
| } | |||
| wxOrder.setId(id); | |||
| wxOrder.updateTenantInfo(getTenantInfo()); | |||
| @@ -2495,7 +2495,9 @@ public class PosServiceImpl implements PosService { | |||
| order.setPosOrderId(posOrderId); | |||
| order.setPosOrderCreateTime(posOrderTime.getTime()); | |||
| order.setPosOrderCreateSn(orderCreateSn); | |||
| order.setComposeOrderId(0L); | |||
| order.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | |||
| order.setCouponNumber(1); | |||
| try { | |||
| orderMapper.insert(order); | |||
| } catch (Exception e) { | |||
| @@ -2576,6 +2578,9 @@ public class PosServiceImpl implements PosService { | |||
| order.setPosOrderCreateTime(posOrderTime.getTime()); | |||
| order.setPosOrderCreateSn(orderCreateSn); | |||
| order.setOrderNumber(orderQ.getOrderNumber()); | |||
| order.setComposeOrderId(0L); | |||
| order.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | |||
| order.setCouponNumber(1); | |||
| try { | |||
| orderMapper.insert(order); | |||
| @@ -872,6 +872,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| record.setDetail(bodyStr); | |||
| record.setCreateDate(curr); | |||
| record.setUpdateDate(curr); | |||
| record.setComposeOrderId(0L); | |||
| record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | |||
| record.setCouponNumber(1); | |||
| try { | |||
| // 保存订单 | |||
| @@ -929,6 +932,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| record.setDetail(bodyStr); | |||
| record.setCreateDate(curr); | |||
| record.setUpdateDate(curr); | |||
| record.setComposeOrderId(0L); | |||
| record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | |||
| record.setCouponNumber(1); | |||
| try { | |||
| // 保存订单 | |||
| @@ -966,7 +972,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| record.setDetail(bodyStr); | |||
| record.setCreateDate(curr); | |||
| record.setUpdateDate(curr); | |||
| record.setComposeOrderId(0L); | |||
| record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | |||
| record.setCouponNumber(1); | |||
| try { | |||
| // 保存订单 | |||
| wxOrderMapper.insert(record); | |||
| @@ -1204,7 +1212,8 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| couponOrder.setCreateDate(curr); | |||
| couponOrder.setUpdateDate(curr); | |||
| couponOrder.setCouponPrice(order.getPayment()); | |||
| couponOrder.setComposeOrderType(order.getComposeOrderType()); | |||
| couponOrder.setComposeOrderId(order.getComposeOrderId()); | |||
| wxCouponOrderMapper.insert(couponOrder); | |||
| /// 储值卡信息添加 | |||
| @@ -1317,8 +1326,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| record.setDetail(bodyStr); | |||
| record.setCreateDate(curr); | |||
| record.setUpdateDate(curr); | |||
| record.setComposeOrderId(0L); | |||
| record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | |||
| record.setCouponNumber(1); | |||
| // 保存订单 | |||
| try { | |||
| wxOrderMapper.insert(record); | |||
| @@ -2195,6 +2205,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| record.setPayment(0); | |||
| record.setFormId(formId); | |||
| record.setOrderGroupId(0L); | |||
| record.setComposeOrderId(0L); | |||
| record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | |||
| record.setCouponNumber(1); | |||
| try { | |||
| saveFreeOrder(record, user, coupon); | |||
| } catch (Exception e) { | |||
| @@ -367,6 +367,9 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||
| rOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); | |||
| rOrder.setCreateDate(currentDate); | |||
| rOrder.setUpdateDate(currentDate); | |||
| rOrder.setComposeOrderId(0L); | |||
| rOrder.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | |||
| rOrder.setCouponNumber(1); | |||
| try { | |||
| wxOrderMapper.insert(rOrder); | |||
| } catch (Exception e) { | |||