irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
admin
2024-06-06 16:39:49 +08:00
parent 3c38c0a9d4
commit ceca5c1711
8 changed files with 101 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java
View File

@@ -15,6 +15,7 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo;
import com.starry.admin.modules.clerk.service.*;
import com.starry.admin.modules.clerk.service.impl.PlayClerkUserInfoServiceImpl;
import com.starry.admin.modules.clerk.service.impl.PlayClerkUserReviewInfoServiceImpl;
import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateQueryVo;
import com.starry.admin.modules.order.module.vo.PlayOrderStateEditVo;
@@ -40,7 +41,9 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
@@ -295,8 +298,26 @@ public class WxClerkController {
if (entity == null) {
throw new CustomException("用户不存在");
}
List<PlayClerkGiftReturnVo> list = giftInfoService.clerkListByAll(id, "1");
return R.ok(list);
//获取所有礼物列表
List<PlayGiftInfoEntity> giftInfoEntities = giftInfoService.listByAll();
//获取已点亮礼物
List<PlayClerkGiftReturnVo> clerkListByAll = giftInfoService.clerkListByAll(id, "1");
//组装数据
List<PlayClerkGiftReturnVo> result = new ArrayList<>();
for (PlayGiftInfoEntity giftInfoEntity : giftInfoEntities) {
PlayClerkGiftReturnVo item = ConvertUtil.entityToVo(giftInfoEntity, PlayClerkGiftReturnVo.class);
for (PlayClerkGiftReturnVo playClerkGiftReturnVo : clerkListByAll) {
if (giftInfoEntity.getId().equals(playClerkGiftReturnVo.getId())) {
item.setGiffNumber(playClerkGiftReturnVo.getGiffNumber());
}
}
result.add(item);
}
Map<String, Object> resuleMap = new HashMap<>();
resuleMap.put("list", result);
resuleMap.put("obtainedGift", clerkListByAll.size());
resuleMap.put("totalGift", giftInfoEntities.size());
return R.ok(resuleMap);
}

36
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCustomController.java
View File

@@ -9,12 +9,16 @@ import com.starry.admin.common.exception.CustomException;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
import com.starry.admin.modules.custom.module.entity.PlayCustomGiftInfoEntity;
import com.starry.admin.modules.custom.module.entity.PlayCustomLeaveMsgEntity;
import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
import com.starry.admin.modules.custom.service.IPlayCustomGiftInfoService;
import com.starry.admin.modules.custom.service.IPlayCustomLeaveMsgService;
import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
import com.starry.admin.modules.gift.module.entity.PlayClerkGiftInfoEntity;
import com.starry.admin.modules.gift.module.entity.PlayGiftInfoEntity;
import com.starry.admin.modules.gift.service.IPlayClerkGiftInfoService;
import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
import com.starry.admin.modules.order.module.entity.PlayOrderComplaintInfoEntity;
import com.starry.admin.modules.order.module.entity.PlayOrderEvaluateInfoEntity;
@@ -95,6 +99,12 @@ public class WxCustomController {
@Resource
private IPlayOrderRandomInfoService playOrderRandomInfoService;
@Resource
private IPlayCustomGiftInfoService playCustomGiftInfoService;
@Resource
private IPlayClerkGiftInfoService playClerkGiftInfoService;
/**
* 根据店员ID查询店员详细信息
@@ -218,6 +228,32 @@ public class WxCustomController {
customUserInfoService.updateAccountBalanceById(customUserInfo.getId(), customUserInfo.getAccountBalance(), customUserInfo.getAccountBalance().subtract(money), "1", "赠送礼物", money, orderId);
// 陪聊增加余额
// clerkUserInfoService.updateAccountBalanceById(clerkUserInfo.getId(), clerkUserInfo.getAccountBalance(), clerkUserInfo.getAccountBalance().add(money), "2", "赠送礼物", money, orderId);
// 修改顾客和礼物消息
PlayCustomGiftInfoEntity customGiftInfoEntity = playCustomGiftInfoService.selectByGiftIdAndCustomId( vo.getGiftId(),userId);
if (customGiftInfoEntity == null) {
customGiftInfoEntity = new PlayCustomGiftInfoEntity();
customGiftInfoEntity.setGiffId(vo.getGiftId());
customGiftInfoEntity.setCustomId(userId);
customGiftInfoEntity.setGiffNumber(1L);
playCustomGiftInfoService.save(customGiftInfoEntity);
} else {
customGiftInfoEntity.setGiffNumber(customGiftInfoEntity.getGiffNumber() + vo.getGiftQuantity());
playCustomGiftInfoService.update(customGiftInfoEntity);
}
// 修改陪玩和礼物数据
PlayClerkGiftInfoEntity clerkGiftInfoEntity = playClerkGiftInfoService.selectByGiftIdAndClerkId(vo.getGiftId(), vo.getClerkId());
if (clerkGiftInfoEntity == null) {
clerkGiftInfoEntity = new PlayClerkGiftInfoEntity();
clerkGiftInfoEntity.setGiffId(vo.getGiftId());
clerkGiftInfoEntity.setClerkId(vo.getClerkId());
clerkGiftInfoEntity.setGiffNumber(0L);
playClerkGiftInfoService.create(clerkGiftInfoEntity);
} else {
customGiftInfoEntity.setGiffNumber(customGiftInfoEntity.getGiffNumber() + vo.getGiftQuantity());
playClerkGiftInfoService.update(clerkGiftInfoEntity);
}
return R.ok("成功");
}

6
play-admin/src/main/java/com/starry/admin/modules/weichat/entity/gift/PlayClerkGiftReturnVo.java
View File

@@ -49,4 +49,10 @@ public class PlayClerkGiftReturnVo {
* 礼物数量
*/
private long giffNumber;
/**
* 礼物状态（0：正常，1：已下架）
*/
private String state;
}