From 63cc713ca321f9fb520a0c9b9796085ed31efb29 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 06 一月 2022 16:32:46 +0800
Subject: [PATCH] Merge branch 'phs' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into phs
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 100 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
index 61acf86..e1abf5b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
@@ -2,6 +2,7 @@
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
+import static org.apache.commons.lang3.StringUtils.isBlank;
import java.util.Arrays;
import java.util.Date;
@@ -9,14 +10,12 @@
import javax.annotation.Resource;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.panzhihua.service_community.dao.McsConfigDAO;
-import com.panzhihua.service_community.dao.McsGameDAO;
-import com.panzhihua.service_community.entity.McsConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,11 +24,15 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsMerchantVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.service_community.dao.McsConfigDAO;
+import com.panzhihua.service_community.dao.McsGameDAO;
import com.panzhihua.service_community.dao.McsMerchantDAO;
+import com.panzhihua.service_community.entity.McsConfig;
import com.panzhihua.service_community.entity.McsMerchant;
import com.panzhihua.service_community.service.McsMerchantService;
@@ -131,14 +134,7 @@
public R getMcsMerchant(Long merchantId) {
McsMerchantVO merchantVO = this.baseMapper.getMcsMerchantById(merchantId);
if (nonNull(merchantVO)) {
- Integer publishLimit = merchantVO.getPublishLimit();
- Integer publishCount = mcsGameDAO.selectPublishCount(merchantVO.getId());
- Integer idleTotal = publishLimit - publishCount;
- merchantVO.setIdleTotal(idleTotal > 0 ? idleTotal : 0);
- if (nonNull(merchantVO.getExpireAt())) {
- int surplusLitDays = DateUtils.differentDays(new Date(), merchantVO.getExpireAt());
- merchantVO.setSurplusLitDays(surplusLitDays > 0 ? surplusLitDays : 0);
- }
+ retrieveMerchantSurplusLitDays(merchantVO);
}
return R.ok(merchantVO);
}
@@ -173,13 +169,7 @@
IPage<McsMerchantVO> mcsMerchants = this.baseMapper.pageMcsMerchant(page, pageMcsMerchantDTO);
List<McsMerchantVO> records = mcsMerchants.getRecords();
if (nonNull(records) && !records.isEmpty()) {
- Date nowDate = new Date();
- records.forEach(e -> {
- if (nonNull(e.getExpireAt())) {
- int surplusLitDays = DateUtils.differentDays(nowDate, e.getExpireAt());
- e.setSurplusLitDays(surplusLitDays > 0 ? surplusLitDays : 0);
- }
- });
+ records.forEach(e -> retrieveMerchantSurplusLitDays(e));
}
return R.ok(mcsMerchants);
}
@@ -207,4 +197,95 @@
return R.fail("未知错误");
}
}
+
+ /**
+ * 根据account查询微商业街商家信息
+ * @param account
+ * @return
+ */
+ @Override
+ public R getMcsMerchantByAccount(String account) {
+ McsMerchantVO merchantVO = this.baseMapper.getMcsMerchantByAccount(account);
+ if (isNull(merchantVO)) {
+ return R.fail("账号不存在");
+ }
+ retrieveMerchantSurplusLitDays(merchantVO);
+ return R.ok(merchantVO);
+ }
+
+ /**
+ * 完成订单更新/新增商家信息
+ *
+ * @param merchantName
+ * @param configId
+ * @param userId
+ * @return
+ */
+ @Override
+ public R updateOrAddMcsMerchantAfterOrder(String merchantName, Long configId, Long userId) {
+ McsMerchant mcsMerchant = this.baseMapper.selectOne(new QueryWrapper<McsMerchant>().lambda().eq(McsMerchant::getUserId, userId));
+ McsConfig mcsConfig = mcsConfigDAO.selectById(configId);
+ if (isNull(mcsConfig) || isBlank(mcsConfig.getValue())) {
+ return R.fail("套餐配置不存在");
+ }
+ JSONObject packageObject = JSONObject.parseObject(mcsConfig.getValue());
+ if (!packageObject.containsKey("day")) {
+ return R.fail("配置有误");
+ }
+ Integer litDays = (Integer)packageObject.get("day");
+ Date nowDate = new Date();
+ int num;
+ if (isNull(mcsMerchant)) {
+ //新增商家
+ R<LoginUserInfoVO> userInfoVOR = userService.getUserInfoByUserId(userId.toString());
+ if (R.isOk(userInfoVOR) && nonNull(userInfoVOR.getData())) {
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(userInfoVOR.getData()), LoginUserInfoVO.class);
+ mcsMerchant = new McsMerchant();
+ mcsMerchant.setName(isBlank(merchantName) ? "默认名称" : merchantName);
+ mcsMerchant.setPhone(loginUserInfoVO.getPhone());
+ mcsMerchant.setAccount(loginUserInfoVO.getAccount());
+ mcsMerchant.setLevel(1);
+ mcsMerchant.setExpireAt(DateUtils.addDay(nowDate, litDays));
+ mcsMerchant.setFirstLitAt(nowDate);
+ McsConfig publishLimitConfig = mcsConfigDAO.selectOne(new QueryWrapper<McsConfig>().lambda().eq(McsConfig::getKey, MERCHANT_PUBLISH_LIMIT_KEY));
+ mcsMerchant.setPublishLimit(nonNull(publishLimitConfig) ? Integer.parseInt(publishLimitConfig.getValue()) : DEFAULT_PUBLISH_LIMIT);
+ mcsMerchant.setUserId(userId);
+ mcsMerchant.setCreatedBy(userId);
+ mcsMerchant.setUpdatedBy(userId);
+ num = this.baseMapper.insert(mcsMerchant);
+ } else {
+ return R.fail("获取用户信息失败");
+ }
+ } else {
+ //更新商家
+ Date previousExpireAt = mcsMerchant.getExpireAt();
+ Date nowExpireAt;
+ if (isNull(previousExpireAt) || previousExpireAt.before(nowDate)) {
+ nowExpireAt = DateUtils.addDay(nowDate, litDays);
+ } else {
+ nowExpireAt = DateUtils.addDay(previousExpireAt, litDays);
+ }
+ McsMerchant mcsMerchant1 = new McsMerchant();
+ mcsMerchant1.setId(mcsMerchant.getId());
+ mcsMerchant1.setExpireAt(nowExpireAt);
+ mcsMerchant1.setUpdatedBy(userId);
+ num = this.baseMapper.updateById(mcsMerchant1);
+ }
+ if (num > 0) {
+ return R.ok();
+ } else {
+ return R.fail();
+ }
+ }
+
+ private void retrieveMerchantSurplusLitDays(McsMerchantVO merchantVO) {
+ Integer publishLimit = merchantVO.getPublishLimit();
+ Integer publishCount = mcsGameDAO.selectPublishCount(merchantVO.getId());
+ Integer idleTotal = publishLimit - publishCount;
+ merchantVO.setIdleTotal(idleTotal > 0 ? idleTotal : 0);
+ if (nonNull(merchantVO.getExpireAt())) {
+ int surplusLitDays = DateUtils.differentDays(new Date(), merchantVO.getExpireAt());
+ merchantVO.setSurplusLitDays(surplusLitDays > 0 ? surplusLitDays : 0);
+ }
+ }
}
--
Gitblit v1.7.1