java/DolphinEnglish.git

			@@ -643,9 +643,9 @@
			@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
			})
			public R<GoodDetailVO> goodDetailParent(@RequestParam String goodId) {
			if (tokenService.getLoginUser1() == null) {
			return R.tokenError("登录失效");
			}
			// if (tokenService.getLoginUser1() == null) {
			// return R.tokenError("登录失效");
			// }
			// 商品详情
			TGoods goods = goodsService.lambdaQuery().eq(TGoods::getId, goodId).one();
			if (null == goods) {

			@@ -63,26 +63,26 @@
			*/
			@Override
			public void updateFill(MetaObject metaObject) {
			// 获取登录信息
			LoginUserParent userStudy = tokenService.getLoginUserStudy();
			if (userStudy != null) {
			String userName = userStudy.getName();
			if (StringUtils.hasLength(userName)) {
			this.setFieldValByName("createBy", userName, metaObject);
			this.setFieldValByName("createTime", new Date(), metaObject);
			this.setFieldValByName("updateBy", userName, metaObject);
			this.setFieldValByName("updateTime", new Date(), metaObject);
			} else {
			this.setFieldValByName("createBy", "", metaObject);
			this.setFieldValByName("updateBy", "", metaObject);
			this.setFieldValByName("createTime", "", metaObject);
			this.setFieldValByName("updateTime", "", metaObject);
			}
			} else {
			this.setFieldValByName("createBy", "", metaObject);
			this.setFieldValByName("updateBy", "", metaObject);
			this.setFieldValByName("createTime", new Date(), metaObject);
			this.setFieldValByName("updateTime", new Date(), metaObject);
			}
			// // 获取登录信息
			// LoginUserParent userStudy = tokenService.getLoginUserStudy();
			// if (userStudy != null) {
			// String userName = userStudy.getName();
			// if (StringUtils.hasLength(userName)) {
			// this.setFieldValByName("createBy", userName, metaObject);
			// this.setFieldValByName("createTime", new Date(), metaObject);
			// this.setFieldValByName("updateBy", userName, metaObject);
			// this.setFieldValByName("updateTime", new Date(), metaObject);
			// } else {
			// this.setFieldValByName("createBy", "", metaObject);
			// this.setFieldValByName("updateBy", "", metaObject);
			// this.setFieldValByName("createTime", "", metaObject);
			// this.setFieldValByName("updateTime", "", metaObject);
			// }
			// } else {
			// this.setFieldValByName("createBy", "", metaObject);
			// this.setFieldValByName("updateBy", "", metaObject);
			// this.setFieldValByName("createTime", new Date(), metaObject);
			// this.setFieldValByName("updateTime", new Date(), metaObject);
			// }
			}
			}

			@@ -1498,9 +1498,9 @@
			@GetMapping("/integralDetailParent")
			@ApiOperation(value = "个人中心-积分明细", tags = {"家长端"})
			@ApiImplicitParams({
			@ApiImplicitParam(value = "查询时间格式yyyy-MM", name = "time", dataType = "Integer"),
			@ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
			@ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
			@ApiImplicitParam(value = "查询时间格式yyyy-MM", name = "time"),
			@ApiImplicitParam(value = "页码", name = "pageNum", required = true),
			@ApiImplicitParam(value = "每页显示条数", name = "pageSize", required = true)
			})
			public R<IPage<TIntegralRecord>> integralDetailParent(String time,
			@RequestParam("pageNum") Integer pageNum,

	ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史