diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGoodsPriceReferController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGoodsPriceReferController.java index cef6b47b..2d7c5c0b 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighGoodsPriceReferController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighGoodsPriceReferController.java @@ -9,13 +9,11 @@ import com.hai.common.security.SessionObject; import com.hai.common.security.UserCenter; import com.hai.common.utils.DateUtil; import com.hai.common.utils.ResponseMsgUtil; -import com.hai.entity.HighCoupon; -import com.hai.entity.HighCouponHandsel; -import com.hai.entity.HighGoodsPriceRefer; -import com.hai.entity.HighMerchant; +import com.hai.entity.*; import com.hai.model.HighCouponModel; import com.hai.model.ResponseData; import com.hai.model.UserInfoModel; +import com.hai.service.HighApproveService; import com.hai.service.HighCouponService; import com.hai.service.HighGoodsPriceReferService; import io.swagger.annotations.Api; @@ -51,6 +49,9 @@ public class HighGoodsPriceReferController { @Resource private HighGoodsPriceReferService highGoodsPriceReferService; + @Resource + private HighApproveService highApproveService; + @Resource private HighCouponService highCouponService; @@ -106,7 +107,8 @@ public class HighGoodsPriceReferController { highGoodsPriceRefer.setStatus(101); // 状态: 0:删除 1:待编辑 2:待生效 3:已生效 4:已失效 101.审批中 102.审批驳回 highGoodsPriceRefer.setOperatorId(userInfoModel.getSecUser().getId()); highGoodsPriceRefer.setOperatorName(userInfoModel.getSecUser().getUserName()); - highGoodsPriceReferService.insertPriceRefer(highGoodsPriceRefer); + // highApproveService.insertApprove(); + highGoodsPriceReferService.submitApprove(highGoodsPriceRefer); return ResponseMsgUtil.success("操作成功"); diff --git a/hai-bweb/src/main/java/com/bweb/excelListener/ImportCouponListener.java b/hai-bweb/src/main/java/com/bweb/excelListener/ImportCouponListener.java index a31f5d36..467f2d50 100644 --- a/hai-bweb/src/main/java/com/bweb/excelListener/ImportCouponListener.java +++ b/hai-bweb/src/main/java/com/bweb/excelListener/ImportCouponListener.java @@ -56,7 +56,7 @@ public class ImportCouponListener extends AnalysisEventListener