From 951177d271c30c07fe545e6a212975031ab13e4a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 17 Jan 2019 15:45:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=B8=E6=9C=89=E6=95=88=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCouponServiceImpl.java | 2 ++ .../com/iformall/service/impl/WxOrderServiceImpl.java | 10 ++++++---- .../iformall/service/impl/WxPayOrderServiceImpl.java | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 81791b0ae..0b9f86452 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -105,6 +105,8 @@ public class WxCouponServiceImpl implements WxCouponService { record.setValidEndDate(null); } else if (record.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME)) { record.setValidDays(null); + } else { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "请填写有效时间类型"); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index f8ba508f8..1371d694d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -817,12 +817,14 @@ public class WxOrderServiceImpl implements WxOrderService { throw new MallinkException(ErrorCode.USER_IS_EMPTY); } // 已支付,更新支付时间 - updateOrder.setPaymentTime(currentDate); - updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); - updateOrder.setUpdateDate(currentDate); + WxOrder updateT = new WxOrder(); + updateT.setId(updateOrder.getId()); + updateT.setPaymentTime(currentDate); + updateT.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); + updateT.setUpdateDate(currentDate); int ret = 0; try { - wxOrderMapper.updateByPrimaryKey(updateOrder); + wxOrderMapper.updateByPrimaryKeySelective(updateT); } catch (Exception e) { logger.error("订单更新失败:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_UPDATE_ERR); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 927eb1b95..3233346c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1156,8 +1156,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { if (payStatus == EnumPayStatus.PAY_STATUS_SUCCESS) { // 已经是成功状态,只更新transactionId try { - record.setUpdateTime(currentDate); - record.setTransactionId(transactionId); + WxPayOrder updateT = new WxPayOrder(); + updateT.setId(record.getId()); + updateT.setUpdateTime(currentDate); + updateT.setTransactionId(transactionId); wxPayOrderMapper.updateByPrimaryKeySelective(record); } catch (Exception e) { logger.error(e.getMessage());