Explorar el Código

Merge tag 'refs/tags/jenkins-back-end-1749' into release

develop
release_toaliyun_real
Stormeye Wu hace 7 años
padre
commit
55c31f6469
Se han modificado 2 ficheros con 6 adiciones y 0 borrados
  1. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql

+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Ver fichero

@@ -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);


+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql Ver fichero

@@ -0,0 +1,2 @@
ALTER TABLE `wx_weapp_audit_status`
ADD COLUMN `screen_shot` VARCHAR(250) NULL DEFAULT NULL AFTER `audit_err_code`;

Cargando…
Cancelar
Guardar