ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
@@ -64,6 +64,7 @@ private LocalDateTime authTime; @ApiModelProperty(value = "平台收货时间") @TableField("receive_time") private LocalDateTime receiveTime; @ApiModelProperty(value = "后台审核备注") ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -126,7 +126,7 @@ SysRole role = new SysRole(); role.setRoleName(dto.getRoleName()); LambdaQueryWrapper<SysRole> wrapper = Wrappers.lambdaQuery(SysRole.class) .eq(SysRole::getRoleName, dto.getRoleName()); .eq(SysRole::getRoleName, dto.getRoleName()).eq(SysRole::getDelFlag, 0); Long userid = tokenService.getLoginUser().getUserid(); SysUser sysUser = sysUserService.getById(userid); if(sysUser.getRoleType() == 2){ ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShareController.java
@@ -79,14 +79,16 @@ appUser.setTotalSharePoint(appUser.getTotalSharePoint() + everySharePoint); appUserService.updateById(appUser); //添加积分变动记录 UserPoint userPoint = new UserPoint(); userPoint.setType(6); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(everySharePoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointService.save(userPoint); if(everySharePoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(6); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(everySharePoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointService.save(userPoint); } //变更等级 appUserService.vipUpgrade(appUser.getId()); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -243,15 +243,17 @@ byId.setLavePoint(byId.getLavePoint() - point); appUserService.updateById(byId); UserPoint userPoint = new UserPoint(); userPoint.setType(15); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(point); userPoint.setBalance(byId.getLavePoint()); userPoint.setAppUserId(userid); userPoint.setObjectId(Long.valueOf(data.getId())); userPoint.setCreateTime(LocalDateTime.now()); userPointService.save(userPoint); if(point > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(15); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(point); userPoint.setBalance(byId.getLavePoint()); userPoint.setAppUserId(userid); userPoint.setObjectId(Long.valueOf(data.getId())); userPoint.setCreateTime(LocalDateTime.now()); userPointService.save(userPoint); } } //增加优惠券记录,根据时间类型设置开始结束时间 UserCoupon userCoupon = new UserCoupon(); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
@@ -98,14 +98,16 @@ appUserService.updateById(appUser); //添加积分变动记录 UserPoint userPoint = new UserPoint(); userPoint.setType(5); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(signPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointService.save(userPoint); if(signPoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(5); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(signPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointService.save(userPoint); } //变更等级 appUserService.vipUpgrade(appUser.getId()); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -924,14 +924,16 @@ appUser.setTotalHourPoint(appUser.getTotalHourPoint() + hourPoint); this.updateById(appUser); //添加积分变动记录 UserPoint userPoint = new UserPoint(); userPoint.setType(6); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(hourPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointService.save(userPoint); if(hourPoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(6); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(hourPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointService.save(userPoint); } //变更等级 vipUpgrade(appUser.getId()); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
@@ -162,14 +162,16 @@ appUserForPhoe.setTotalAvailablePoint(appUserForPhoe.getTotalAvailablePoint() + point); appUserService.updateById(appUserForPhoe); //构建积分流水记录 UserPoint userPoint = new UserPoint(); userPoint.setType(12); userPoint.setHistoricalPoint(lavePoint1); userPoint.setVariablePoint(point); userPoint.setBalance(appUserForPhoe.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUserForPhoe.getId()); userPointService.save(userPoint); if(point > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(12); userPoint.setHistoricalPoint(lavePoint1); userPoint.setVariablePoint(point); userPoint.setBalance(appUserForPhoe.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUserForPhoe.getId()); userPointService.save(userPoint); } Integer lavePoint = appUser.getLavePoint(); appUser.setLavePoint(appUser.getLavePoint() - point); @@ -177,14 +179,16 @@ appUser.setAvailablePoint(appUser.getAvailablePoint() - point); appUserService.updateById(appUser); //构建积分流水记录 userPoint = new UserPoint(); userPoint.setType(13); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(point); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointService.save(userPoint); if(point > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(13); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(point); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointService.save(userPoint); } return R.ok(); }
@@ -43,6 +43,7 @@ AND tup.create_time BETWEEN #{userPoint.startTime} AND #{userPoint.endTime} </if> </where> order tup.create_time desc </sql> <select id="queryUserPointPage" resultType="com.ruoyi.account.api.model.UserPoint"> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -517,15 +517,17 @@ appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint); //构建积分流水明细 UserPoint userPoint = new UserPoint(); userPoint.setType(1); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(shopPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(order.getAppUserId()); userPoint.setObjectId(order.getId()); userPointClient.saveUserPoint(userPoint); if(shopPoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(1); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(shopPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(order.getAppUserId()); userPoint.setObjectId(order.getId()); userPointClient.saveUserPoint(userPoint); } appUserClient.editAppUserById(appUser); //降级检测 @@ -594,15 +596,17 @@ appUser.setTransferablePoint(appUser.getTransferablePoint() + transferablePoint); //构建积分流水明细 UserPoint userPoint = new UserPoint(); userPoint.setType(11); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(order.getPoint()); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(order.getAppUserId()); userPoint.setObjectId(order.getId()); userPointClient.saveUserPoint(userPoint); if(order.getPoint() > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(11); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(order.getPoint()); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(order.getAppUserId()); userPoint.setObjectId(order.getId()); userPointClient.saveUserPoint(userPoint); } appUserClient.editAppUserById(appUser); } @@ -650,15 +654,17 @@ appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint); //构建积分流水明细 UserPoint userPoint = new UserPoint(); userPoint.setType(1); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(shopPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(order.getAppUserId()); userPoint.setObjectId(order.getId()); userPointClient.saveUserPoint(userPoint); if(shopPoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(1); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(shopPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(order.getAppUserId()); userPoint.setObjectId(order.getId()); userPointClient.saveUserPoint(userPoint); } appUserClient.editAppUserById(appUser); //降级检测 @@ -710,15 +716,17 @@ appUser.setTransferablePoint(appUser.getTransferablePoint() + transferablePoint); //构建积分流水明细 UserPoint userPoint = new UserPoint(); userPoint.setType(11); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(order.getPoint()); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(order.getAppUserId()); userPoint.setObjectId(order.getId()); userPointClient.saveUserPoint(userPoint); if(order.getPoint() > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(11); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(order.getPoint()); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(order.getAppUserId()); userPoint.setObjectId(order.getId()); userPointClient.saveUserPoint(userPoint); } return R.ok(); }
@@ -1129,16 +1129,18 @@ jsonObject.put("transferablePoint", earnPoint1); } UserPoint userPoint = new UserPoint(); userPoint.setType(1); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(earnPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPoint.setObjectId(order.getId()); userPoint.setExtention(jsonObject.toJSONString()); userPointClient.saveUserPoint(userPoint); if(earnPoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(1); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(earnPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPoint.setObjectId(order.getId()); userPoint.setExtention(jsonObject.toJSONString()); userPointClient.saveUserPoint(userPoint); } } appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN)); appUser.setLastShopTime(LocalDateTime.now()); @@ -1313,16 +1315,18 @@ } //构建积分流水记录 UserPoint userPoint = new UserPoint(); userPoint.setType(11); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(orderPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPoint.setObjectId(order.getId()); userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + ""); userPointClient.saveUserPoint(userPoint); if(orderPoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(11); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(orderPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPoint.setObjectId(order.getId()); userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + ""); userPointClient.saveUserPoint(userPoint); } appUser.setLastShopTime(LocalDateTime.now()); appUserClient.editAppUserById(appUser); @@ -1458,16 +1462,18 @@ jsonObject.put("transferablePoint", earnPoint1); } UserPoint userPoint = new UserPoint(); userPoint.setType(1); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(earnPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPoint.setObjectId(order.getId()); userPoint.setExtention(jsonObject.toJSONString()); userPointClient.saveUserPoint(userPoint); if(earnPoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(1); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(earnPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPoint.setObjectId(order.getId()); userPoint.setExtention(jsonObject.toJSONString()); userPointClient.saveUserPoint(userPoint); } } appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN)); appUser.setLastShopTime(LocalDateTime.now()); @@ -1537,16 +1543,18 @@ } //构建积分流水记录 UserPoint userPoint = new UserPoint(); userPoint.setType(11); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(orderPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPoint.setObjectId(order.getId()); userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + ""); userPointClient.saveUserPoint(userPoint); if(orderPoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setType(11); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(orderPoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPoint.setObjectId(order.getId()); userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + ""); userPointClient.saveUserPoint(userPoint); } //积分支付不反积分
@@ -327,15 +327,17 @@ appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint); appUserClient.editAppUserById(appUser); //添加积分流水 UserPoint userPoint = new UserPoint(); userPoint.setAppUserId(userid); userPoint.setType(4); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(everySharePoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointClient.saveUserPoint(userPoint); if(everySharePoint > 0){ UserPoint userPoint = new UserPoint(); userPoint.setAppUserId(userid); userPoint.setType(4); userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(everySharePoint); userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); userPointClient.saveUserPoint(userPoint); } } } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/CouponInfoServiceImpl.java
@@ -2,10 +2,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.other.api.domain.Goods; import com.ruoyi.other.mapper.CouponInfoMapper; import com.ruoyi.other.api.domain.CouponInfo; import com.ruoyi.other.service.CouponInfoService; import com.ruoyi.other.service.GoodsService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; /** * <p> @@ -17,9 +24,21 @@ */ @Service public class CouponInfoServiceImpl extends ServiceImpl<CouponInfoMapper, CouponInfo> implements CouponInfoService { @Resource private GoodsService goodsService; @Override public IPage<CouponInfo> queryCouponInfoPage(IPage<CouponInfo> page, CouponInfo couponInfo) { return this.baseMapper.queryCouponInfoPage(page, couponInfo); IPage<CouponInfo> couponInfoIPage = this.baseMapper.queryCouponInfoPage(page, couponInfo); for (CouponInfo record : couponInfoIPage.getRecords()) { if(record.getCouponType() == 4){ String[] split = record.getForGoodIds().split(","); List<String> collect = goodsService.listByIds(Arrays.asList(split)).stream().map(Goods::getName).collect(Collectors.toList()); record.setGoodsNameList(collect); } } return couponInfoIPage; } } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
@@ -78,7 +78,7 @@ LocalDateTime endTime = seckillActivityVO.getEndTime(); if (endTime.isBefore(now)){ seckillActivityVO.setStatus(3); //已结束 }else if (startTime.isBefore(now)){ }else if (startTime.isBefore(now) && endTime.isAfter(now)){ seckillActivityVO.setStatus(2); // 已开始 }else { seckillActivityVO.setStatus(1); // 未开始 ruoyi-service/ruoyi-other/src/main/resources/mapper/other/CouponInfoMapper.xml
@@ -25,7 +25,8 @@ tci.need_point, tci.person_type, tci.person_ids, tci.shelf_status tci.shelf_status, tci.goods_name_json FROM t_coupon_info tci <where> ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopBalanceStatementMapper.xml
@@ -12,6 +12,7 @@ t_shop_balance_statement tsbs INNER JOIN t_shop ts ON ts.id = tsbs.shop_id <where> tsbs.type != 4 <if test="bs.shopName != null and bs.shopName != ''"> AND ts.`name` like concat('%', #{bs.shopName}, '%') </if>
