diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/ApiWxPayController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/ApiWxPayController.java index 3e9ce2329..e9c3dba04 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/ApiWxPayController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/ApiWxPayController.java @@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -65,7 +66,11 @@ public class ApiWxPayController extends BaseController { TrainCourseUser courseUser = new TrainCourseUser(); courseUser.setVipUserId(vipUserOrders.getVipUserId()); courseUser.setTrainCourseId(vipUserOrders.getTrainCourseId()); - trainCourseUserService.insert(courseUser); + courseUser.setDelFlag("0"); + courseUser.setCreateDate(new Date()); + courseUser.setUpdateDate(new Date()); + courseUser.setRemarks("微信支付成功回调,订单ID:"+vipUserOrders.getId()); + trainCourseUserService.insertSelectiveNormal(courseUser); } return WxPayNotifyResponse.success("成功"); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java index d32e5b40c..82e0ce54b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseService.java @@ -52,18 +52,31 @@ public abstract interface AbstractBaseService { public Long selectCount(T entity); /** - * 保存 + * 保存(并且自动给填充用户信息) * @param entity * @return */ public int insert(T entity); /** - * 保存不为null的数据 + * 保存不为null的数据(并且自动给填充用户信息) * @param entity * @return */ public int insertSelective(T entity); + /** + * 保存 + * @param entity + * @return + */ + public int insertNormal(T entity); + + /** + * 保存不为null的数据 + * @param entity + * @return + */ + public int insertSelectiveNormal(T entity); /** * 删除符合条件的数据 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java index e1ad9f9bc..d65ad9b3c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java @@ -68,7 +68,14 @@ public abstract class AbstractBaseServiceImpl, T> implemen EntityUtils.setCreateAndUpdateInfo(entity); return mapper.insertSelective(entity); } - + @Override + public int insertNormal(T entity) { + return mapper.insert(entity); + } + @Override + public int insertSelectiveNormal(T entity) { + return mapper.insertSelective(entity); + } @Override public int delete(T entity) {