ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/TOrder.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.web.domain.BaseModel; @@ -79,7 +80,12 @@ private String consigneePhone; @ApiModelProperty(value = "收货人地址") private String consigneeAddress; @ApiModelProperty(value = "收货地址 所属省") @TableField("province") private String province; @ApiModelProperty(value = "收货地址 所属市") @TableField("city") private String city; public Integer getId() { return id; } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -178,11 +178,13 @@ user.setNickName(nickName); user.setDeptId(deptId); user.setPhonenumber(phonenumber); SysUser byId = userService.getById(dto.getUserId()); if (!byId.getPhonenumber().equals(phonenumber)){ if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !userService.checkPhoneUnique(user)) { user.setUserId(dto.getUserId()); List<SysUser> list = userService.list(new QueryWrapper<SysUser>() .eq("del_flag", 0) .ne("user_id",dto.getUserId()) .eq("phonenumber", dto.getPhonenumber())); if (!list.isEmpty()){ return error("手机号已存在，请重新输入"); } } user.setUserName(user.getPhonenumber()); if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){ ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -137,6 +137,15 @@ @PostMapping("/deleteGoodsType/{id}") @ApiOperation(value = "删除", tags = {"后台-商品类型管理"}) public R deleteGoodsType(@PathVariable("id") Integer id) { // 初始化条件构造器 QueryWrapper<TGoods> wrapper = new QueryWrapper<>(); // 类型匹配 todo wrapper.or().apply("FIND_IN_SET('" + id + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数 wrapper.eq("isDelete", 0); List<TGoods> list = goodsService.list(wrapper); if (!list.isEmpty()){ return R.fail("当前商品分类被使用,无法删除!"); } TGoodsType byId = goodsTypeService.getById(id); byId.setIsDelete(1); goodsTypeService.removeById(byId); @@ -153,8 +162,12 @@ wrapper.orderByDesc("id"); List<TGoods> list = goodsService.list(wrapper); for (TGoods tGoods : list) { long goodsId = orderService.count(new QueryWrapper<TOrder>().eq("goodsId", tGoods.getId())); tGoods.setInventory(goodsId); Long temp = 0L; List<TOrder> list1 = orderService.list(new QueryWrapper<TOrder>().eq("goodsId", tGoods.getId())); for (TOrder tOrder : list1) { temp+=tOrder.getCount(); } tGoods.setInventory(temp); } PageInfo<TGoods> res = new PageInfo<>(query.getPageNumber(), query.getPageSize()); res.setRecords(list); @@ -817,11 +830,14 @@ TOrder byId = orderService.getById(id); TGoods byId2 = goodsService.getById(byId.getGoodsId()); TOrderVO tGoodsVO = new TOrderVO(); tGoodsVO.setName(byId2.getName()); BeanUtils.copyProperties(byId, tGoodsVO); tGoodsVO.setName(byId2.getName()); TUser byId1 = studyClient.getUserById(byId.getUserId()).getData(); tGoodsVO.setUserName(byId1.getName()); tGoodsVO.setPhone(byId1.getPhone()); if (byId.getProvince()!=null && byId.getCity() != null){ tGoodsVO.setConsigneeAddress(byId.getProvince()+byId.getCity()+tGoodsVO.getConsigneeAddress()); } return R.ok(tGoodsVO); } @@ -842,7 +858,7 @@ @ApiOperation(value = "列表查询", tags = {"后台-订单管理"}) @ApiOperationSupport(order = 13) public R<PageInfo<TOrderVO>> listAll1(@RequestBody OrderQuery query) throws ParseException { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); if (query.getEndTime() != null) { Date parse = format.parse(query.getStartTime()); ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TGoods.java
@@ -59,15 +59,16 @@ @ApiModelProperty(value = "基础已兑换数量") private Integer basicCount; /** * 剩余数量 */ @ApiModelProperty(value = "剩余数量") private Integer surplus; /** * 单个用户可兑换数量 */ @ApiModelProperty(value = "单个用户可兑换数量") private Integer userCount; /** * 剩余数量 */ @ApiModelProperty(value = "剩余数量") private Integer surplus; /** * 商品类型id ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
@@ -103,6 +103,13 @@ @ApiModelProperty(value = "收货人地址") private String consigneeAddress; @ApiModelProperty(value = "收货地址 所属省") @TableField("province") private String province; @ApiModelProperty(value = "收货地址 所属市") @TableField("city") private String city; @ApiModelProperty(value = "订单备注") @TableField("remark") private String remark; ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
@@ -158,6 +158,8 @@ Integer goodId, int needIntegral) { // 兑换成功，生成订单信息、生成积分明细(积分明细需要远程调用rouyi-study服务) TOrder order = orderInfo(goodExchange, recipient, number, goodId, needIntegral); order.setProvince(recipient.getProvince()); order.setCity(recipient.getCity()); boolean result = orderService.save(order); // 远程调用，生成积分明细 result = result && studyClient.addIntegralDetail(Constants.BURDEN + needIntegral, Constants.SHOPPING_CONSUME).getData(); @@ -170,6 +172,8 @@ Integer goodId, int needIntegral) { // 兑换成功，生成订单信息、生成积分明细(积分明细需要远程调用rouyi-study服务) TOrder order = orderInfoParent(goodExchange, recipient, number, goodId, needIntegral); order.setProvince(recipient.getProvince()); order.setCity(recipient.getCity()); boolean result = orderService.save(order); // 远程调用，生成积分明细 result = result && studyClient.addIntegralDetailParent(Constants.BURDEN + needIntegral, Constants.SHOPPING_CONSUME).getData(); ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml
@@ -45,7 +45,7 @@ <if test="null != req.startTime"> and t1.insertTime between #{req.startTime} and #{req.endTime} </if> order by t1.insertTime desc order by t1.state asc, t1.insertTime desc </select> <select id="getGoodBuyNumber" resultType="java.lang.Integer"> ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.goods.api.domain.TGoods; @@ -71,7 +72,10 @@ @PostMapping("/deleteGoodsType") @ApiOperation(value = "删除", tags = {"后台-商品类型管理"}) public AjaxResult deleteGoodsType(Integer id) { goodsClient.deleteGoodsType(id); R r = goodsClient.deleteGoodsType(id); if (r.getCode()!=200){ return AjaxResult.error(r.getMsg()); } // TGoodsType byId = goodsTypeService.getById(id); // byId.setIsDelete(1); // goodsTypeService.updateById(byId); ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
@@ -182,7 +182,6 @@ List<String> strings = new ArrayList<>(); strings.add("insertTime"); wrapper.orderByDesc(strings); List<TUseGuide> useGuides = useGuideService.list(wrapper); PageInfo<TUseGuide> res = new PageInfo<>(pageNumber, pageSize); res.setRecords(useGuides); @@ -204,8 +203,6 @@ PageInfo<TUseGuide> res = new PageInfo<>(query.getPageNumber(), query.getPageSize()); List<TUseGuide> useGuides = useGuideService.list(wrapper); List<TUseGuide> useGuides2 = useGuideService.listAll(query); PageInfo<TUseGuide> page = useGuideService.page(new PageInfo<>(query.getPageNumber(), query.getPageSize()), wrapper); res.setRecords(useGuides2); res.setTotal(useGuides.size());
@@ -21,6 +21,7 @@ <if test="null != req.title and '' != req.title"> and title like CONCAT('%', #{req.title}, '%') </if> AND disabled = ${@com.ruoyi.common.core.enums.DisabledEnum@NO.getCode()} order by insertTime desc limit #{req.pageNumber}, #{req.pageSize} </select> @@ -30,6 +31,7 @@ <if test="null != req.title and '' != req.title"> and title like CONCAT('%', #{req.title}, '%') </if> AND disabled = ${@com.ruoyi.common.core.enums.DisabledEnum@NO.getCode()} order by insertTtime desc </select> ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -97,15 +97,12 @@ wrapper.like("type", query.getType()); } wrapper.eq("state", 1); List<TStory> tStories = new ArrayList<>(); switch (query.getStoryType()) { case 2: List<TStory> list = storyService.list(wrapper); List<TStory> tSubjects = new ArrayList<>(); for (TStory tSubject : list) { if (!tSubject.getError().isEmpty()) { tSubjects.add(tSubject); } } List<TStory> tSubjects = new ArrayList<>(list); res.setRecords(tSubjects); res.setTotal(tSubjects.size()); return R.ok(res); @@ -113,8 +110,13 @@ // 查询出error字段不为空的数据 wrapper.isNotNull("error"); List<TStory> list1 = storyService.list(wrapper); res.setRecords(list1); res.setTotal(list1.size()); for (TStory tStory : list1) { if (tStory.getError()!=null && (!tStory.equals(""))){ tStories.add(tStory); } } res.setRecords(tStories); res.setTotal(tStories.size()); return R.ok(res); } ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStoryMapper.xml
@@ -34,6 +34,7 @@ <if test="req.type != null and req.type != ''"> and `type` like concat('%',#{req.type},'%') </if> order by createTime desc </select> </mapper> ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TSubjectMapper.xml
@@ -34,6 +34,7 @@ <if test="req.type != null and req.type != ''"> and `type` like concat('%',#{req.type},'%') </if> order by createTime desc </select> </mapper>
