| @@ -1108,13 +1108,7 @@ public class PosServiceImpl implements PosService { | |||||
| posCouponOrderVerify = posCouponOrderVerifyList.get(0); | posCouponOrderVerify = posCouponOrderVerifyList.get(0); | ||||
| if (posCouponOrderVerify != null) { | if (posCouponOrderVerify != null) { | ||||
| try { | try { | ||||
| PosCouponOrderVerify updateCouponOrderVerify = new PosCouponOrderVerify(); | |||||
| updateCouponOrderVerify.setId(posCouponOrderVerify.getId()); | |||||
| updateCouponOrderVerify.setTenantId(posCouponOrderVerify.getTenantId()); | |||||
| updateCouponOrderVerify.setState(EnumEnableType.Disable.getCode()); | |||||
| updateCouponOrderVerify.setUpdateDate(new Date()); | |||||
| posCouponOrderVerifyService.saveOrUpdate(updateCouponOrderVerify); | |||||
| //posCouponOrderVerifyService.deleteById(posCouponOrderVerify.getId()); | |||||
| posCouponOrderVerifyService.deleteById(posCouponOrderVerify.getId()); | |||||
| } catch(Exception e){ | } catch(Exception e){ | ||||
| logger.error("db failed: couponOrder-" + couponOrderCVo.getId() + ", e:" + e.getMessage()); | logger.error("db failed: couponOrder-" + couponOrderCVo.getId() + ", e:" + e.getMessage()); | ||||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | ||||
| @@ -333,7 +333,7 @@ public class PosAppTest { | |||||
| reqObj.put(WxPayConstant.TENANT_ID, tenantId); | reqObj.put(WxPayConstant.TENANT_ID, tenantId); | ||||
| reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); | reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); | ||||
| reqObj.put(WxPayConstant.BUSER_ID, buUserId); | reqObj.put(WxPayConstant.BUSER_ID, buUserId); | ||||
| reqObj.put(WxPayConstant.COUPON_ORDER_ID, "318978990426783744"); | |||||
| reqObj.put(WxPayConstant.COUPON_ORDER_ID, "321878223800205312"); | |||||
| reqObj.put(WxPayConstant.NONCE_STR, "1"); | reqObj.put(WxPayConstant.NONCE_STR, "1"); | ||||
| reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); | reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); | ||||
| reqObj.put(WxPayConstant.POS_AMOUNT, "200"); | reqObj.put(WxPayConstant.POS_AMOUNT, "200"); | ||||