From 757522e6be25b3a27f765cd9c39e520f6451e73b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 27 May 2019 19:07:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=BA=93=E5=AD=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=B8=E7=B1=BB=E5=9E=8B=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/market/WxCouponController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 2246a9de5..d96d310da 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -74,6 +74,10 @@ public class WxCouponController extends BaseController { logger.error("缺少id"); return new ResultData(ResultData.ERROR, "缺少id"); } + if(wxCoupon.getType() == null) { + logger.error("缺少type"); + return new ResultData(ResultData.ERROR, "缺少type"); + } if(wxCoupon.getRemainInventory() == null || wxCoupon.getInventory() == null) { logger.error("库存错误1"); return new ResultData(ErrorCode.COUPON_STOCK_ERR); From 40bbb21b97b7fbff25984edede4f214f00d1bdfe Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 28 May 2019 10:02:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8][=E4=BF=AE=E6=94=B9]:=E5=AE=A1=E6=A0=B8=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=B7=BB=E5=8A=A0screen=5Fshot=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql new file mode 100644 index 000000000..935786b46 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql @@ -0,0 +1,2 @@ +ALTER TABLE `wx_weapp_audit_status` +ADD COLUMN `screen_shot` VARCHAR(250) NULL DEFAULT NULL AFTER `audit_err_code`;