INSERT INTO zxjp_store_message (
store_id,
store_code,
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserLoginDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserLoginDTO.java
new file mode 100644
index 000000000..e309d2826
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserLoginDTO.java
@@ -0,0 +1,27 @@
+package com.cool.store.dto.login;
+
+import com.cool.store.enums.LoginTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ *
+ * 登录DTO
+ *
+ *
+ * @author wangff
+ * @since 2025/9/3
+ */
+@Data
+public class UserLoginDTO {
+ @ApiModelProperty("手机号")
+ private String mobile;
+
+ @ApiModelProperty("密码")
+ private String password;
+
+ @NotNull(message = "登录类型不能为空")
+ private LoginTypeEnum loginType;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserRefreshLoginDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserRefreshLoginDTO.java
new file mode 100644
index 000000000..acfa484c3
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserRefreshLoginDTO.java
@@ -0,0 +1,18 @@
+package com.cool.store.dto.login;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * RefreshToken登录DTO
+ *
+ *
+ * @author wangff
+ * @since 2025/9/5
+ */
+@Data
+public class UserRefreshLoginDTO {
+ @ApiModelProperty("RefreshToken")
+ private String refreshToken;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreOrderTimeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreOrderTimeDTO.java
new file mode 100644
index 000000000..ed3f0aa40
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreOrderTimeDTO.java
@@ -0,0 +1,27 @@
+package com.cool.store.dto.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ *
+ * 门店最新订货时间DTO
+ *
+ *
+ * @author wangff
+ * @since 2025/10/23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StoreOrderTimeDTO {
+ @ApiModelProperty("门店id")
+ private String storeId;
+
+ @ApiModelProperty("最新订货时间")
+ private Date latestOrderTime;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java
index cf19521de..45fc4eb20 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java
@@ -5,7 +5,10 @@ import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Length;
import javax.persistence.*;
@@ -18,6 +21,9 @@ import javax.validation.constraints.NotBlank;
*/
@Table(name = "xfsg_build_information")
@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
public class BuildInformationDO {
@Id
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/login/UserLoginDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/login/UserLoginDO.java
new file mode 100644
index 000000000..c8965d44b
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/login/UserLoginDO.java
@@ -0,0 +1,33 @@
+package com.cool.store.entity.login;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * 用户登录信息
+ *
+ *
+ * @author wangff
+ * @since 2025/9/3
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserLoginDO {
+ /**
+ * 用户id
+ */
+ private String userId;
+
+ /**
+ * 手机号
+ */
+ private String mobile;
+
+ /**
+ * 密码
+ */
+ private String password;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java
index 0a771beac..642bc5d6d 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java
@@ -49,6 +49,12 @@ public class StoreMasterDTO {
@ApiModelProperty("省市区")
private String area;
+ @ApiModelProperty("省")
+ private String province;
+ @ApiModelProperty("市")
+ private String city;
+ @ApiModelProperty("区/县")
+ private String district;
@ApiModelProperty("乡镇")
private String town;
@ApiModelProperty("门店地址")
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/bigdata/LatestOrderDateRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/bigdata/LatestOrderDateRequest.java
new file mode 100644
index 000000000..d29ccb1ed
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/bigdata/LatestOrderDateRequest.java
@@ -0,0 +1,33 @@
+package com.cool.store.request.bigdata;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * 最新订货日期Request
+ *
+ *
+ * @author wangff
+ * @since 2025/10/23
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LatestOrderDateRequest {
+ /**
+ * 页码
+ */
+ private Integer pageNum;
+
+ /**
+ * 页数量
+ */
+ private Integer pageSize;
+
+ /**
+ * 门店编码列表
+ */
+ private String store_code;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/notice/BatchPublishRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/BatchPublishRequest.java
index 2d824e021..832d5c5bd 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/notice/BatchPublishRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/notice/BatchPublishRequest.java
@@ -22,4 +22,6 @@ public class BatchPublishRequest {
@ApiModelProperty( "默认处理人信息 type[person position userGroup organization]")
List userInfoList;
+ @ApiModelProperty("事项类型")
+ private Integer matterType;
}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/bigdata/ApiPageResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/bigdata/ApiPageResponse.java
new file mode 100644
index 000000000..f1bd4d03c
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/bigdata/ApiPageResponse.java
@@ -0,0 +1,21 @@
+package com.cool.store.response.bigdata;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 分页对象
+ *
+ *
+ * @author wangff
+ * @since 2025/10/27
+ */
+@Data
+public class ApiPageResponse {
+ private Integer total;
+ private List list;
+ private Integer pageNum;
+ private Integer pageSize;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/bigdata/LatestOrderDateResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/bigdata/LatestOrderDateResponse.java
new file mode 100644
index 000000000..0b6cfa944
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/bigdata/LatestOrderDateResponse.java
@@ -0,0 +1,24 @@
+package com.cool.store.response.bigdata;
+
+import lombok.Data;
+
+/**
+ *
+ * 最新订货日期Response
+ *
+ *
+ * @author wangff
+ * @since 2025/10/23
+ */
+@Data
+public class LatestOrderDateResponse {
+ /**
+ * 门店编码
+ */
+ private String store_code;
+
+ /**
+ * 最新订货日期，yyyy-MM-dd
+ */
+ private String latest_buy_date;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/userholder/RefreshUser.java b/coolstore-partner-model/src/main/java/com/cool/store/userholder/RefreshUser.java
new file mode 100644
index 000000000..b8a84fc0f
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/userholder/RefreshUser.java
@@ -0,0 +1,33 @@
+package com.cool.store.userholder;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * RefreshToken用户信息
+ *
+ *
+ * @author wangff
+ * @since 2025/9/5
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RefreshUser {
+ /**
+ * 用户Id
+ */
+ private String userId;
+
+ /**
+ * RefreshToken
+ */
+ private String refreshToken;
+
+ /**
+ * 手机号
+ */
+ private String mobile;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/login/UserBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/login/UserBaseInfoVO.java
new file mode 100644
index 000000000..cceaadf5c
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/login/UserBaseInfoVO.java
@@ -0,0 +1,35 @@
+package com.cool.store.vo.login;
+
+import com.cool.store.entity.SysRoleDO;
+import lombok.Data;
+
+/**
+ *
+ * 登录用户基本信息VO
+ *
+ *
+ * @author wangff
+ * @since 2025/9/5
+ */
+@Data
+public class UserBaseInfoVO {
+ private String id;
+
+ private String userId;
+
+ private String name;
+
+ private Boolean isAdmin;
+
+ private String mobile;
+
+ private String email;
+
+ private String avatar;
+
+ private String roles;
+
+ private String language;
+
+ private SysRoleDO sysRoleDO;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/login/UserLoginVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/login/UserLoginVO.java
new file mode 100644
index 000000000..ac6370bdb
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/login/UserLoginVO.java
@@ -0,0 +1,38 @@
+package com.cool.store.vo.login;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * 用户登录VO
+ *
+ *
+ * @author wangff
+ * @since 2025/9/4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserLoginVO {
+ /**
+ * 登录token
+ */
+ private String accessToken;
+
+ /**
+ * 刷新token
+ */
+ private String refreshToken;
+
+ /**
+ * accessToken过期时间
+ */
+ private Integer expire;
+
+ /**
+ * 用户信息
+ */
+ private UserBaseInfoVO user;
+}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseService.java
index f00f75d0b..33ddacccc 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseService.java
@@ -1,5 +1,8 @@
package com.cool.store.service;
+import com.cool.store.userholder.CurrentUser;
+import com.cool.store.userholder.RefreshUser;
+
/**
* @Author suzhuhong
* @Date 2025/5/29 16:34
@@ -13,7 +16,17 @@ public interface EnterpriseService {
* @param mobile
* @return
*/
- String getAccessToken(String mobile);
+ CurrentUser getLoginInfo(String mobile);
+ /**
+ * 获取并缓存refreshToken
+ */
+ RefreshUser getRefreshUser(String userId, String mobile);
+ /**
+ * 校验用户新建分店/新建线索 可以选择加盟类型类型
+ * @param userId
+ * @param joinMode
+ */
+ void checkUser(String userId,Integer joinMode);
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java
index 567103c82..941a8a741 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/MessageTemplateService.java
@@ -91,15 +91,15 @@ public interface MessageTemplateService {
*/
Boolean revokeById(Long id, LoginUserInfo user);
- List getModuleList(String storeId,PartnerUserInfoVO userInfoVO);
+ List getModuleList(String storeId,String mobile);
PageInfo getStorePendingList(StoreMessagePendingRequest request);
MessageDetailVO getMessageDetail(Long id);
- Boolean readMessage(Long id, PartnerUserInfoVO userInfoVO);
+ Boolean readMessage(Long id, String mobile);
- Boolean handleMessage(Long id, PartnerUserInfoVO userInfoVO);
+ Boolean handleMessage(Long id, String userName,String mobile);
ApiResponse thirdHandleMessage(ThirdHandleMessageRequest request);
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java
index 508c602f9..5cc920f53 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java
@@ -48,6 +48,12 @@ public interface PreparationService {
* @param shopId
*/
void sysStoreCompleted(Long shopId);
+
+ /**
+ * 营业执照和建店资料收集阶段完成后推进POS和营帐通开通
+ * @param shopId 店铺id
+ */
+ void businessLicenseAndBuildStoreCompleted(Long shopId);
/**
* 证照办理+建店资料 都完成 初始化平台建店数据
* @param shopId
@@ -89,6 +95,7 @@ public interface PreparationService {
/**
* POS 建店昨天完成
* 选址与建店资料完成(加盟合同完成)
+ * v20251024 选址与建店资料完成与营业执照完成
* @param shopId
* @return
*/
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ThirdBigDataService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ThirdBigDataService.java
index 4e690ee3c..2349eea5a 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/ThirdBigDataService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ThirdBigDataService.java
@@ -1,8 +1,10 @@
package com.cool.store.service;
+import com.cool.store.request.bigdata.LatestOrderDateRequest;
import com.cool.store.request.bigdata.ProfitDataRequest;
import com.cool.store.request.oppty.CityRequest;
import com.cool.store.response.bigdata.ActDataResponse;
+import com.cool.store.response.bigdata.LatestOrderDateResponse;
import com.cool.store.response.bigdata.ProfitDataResponse;
import com.cool.store.response.bigdata.ProfitRateResponse;
import com.cool.store.response.oppty.CityResponse;
@@ -53,5 +55,11 @@ public interface ThirdBigDataService {
*/
ActDataResponse getActData(ProfitDataRequest requestBody);
+ /**
+ * 获取门店最新订货日期
+ * @param requestBody 最新订货日期Request
+ * @return 最新订货日期Response列表
+ */
+ List getLatestOrderDate(LatestOrderDateRequest requestBody);
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
index 773f13871..885c089d6 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
@@ -138,9 +138,11 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_3);
if (Constants.ONE_INTEGER.equals(request.getSubmitStatus()) && shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus())) {
shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33, null);
+ preparationService.businessLicenseAndBuildStoreCompleted(request.getShopId());
preparationService.licenseCompleted(request.getShopId());
preparationService.updateShopStatus(request.getShopId());
preparationService.buildStoreAndDecorationComplete(request.getShopId());
+ preparationService.selectSiteAndBuildStoreComplete(request.getShopId());
}
return Boolean.TRUE;
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
index 1daeb4fb5..acd630ce4 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
@@ -73,6 +73,8 @@ public class BuildInformationServiceImpl implements BuildInformationService {
private OrderSysInfoDAO orderSysInfoDAO;
@Autowired
private BigRegionDAO bigRegionDAO;
+ @Resource
+ private AcceptanceInfoDAO acceptanceInfoDAO;
@Override
@@ -252,7 +254,14 @@ public class BuildInformationServiceImpl implements BuildInformationService {
if (StringUtils.isBlank(response.getAddresseeAddress())) {
response.setAddresseeAddress(shopInfo.getDetailAddress());
}
-
+ // 不存在的情况下从装修验收中获取
+ if (StringUtils.isBlank(response.getDoorPhoto()) || StringUtils.isBlank(response.getInStorePhoto())) {
+ AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
+ if (Objects.nonNull(acceptanceInfoDO)) {
+ response.setDoorPhoto(StringUtils.isNotBlank(response.getDoorPhoto()) ? response.getDoorPhoto() : acceptanceInfoDO.getShopDoorwayPhoto());
+ response.setInStorePhoto(StringUtils.isNotBlank(response.getInStorePhoto()) ? response.getInStorePhoto() : acceptanceInfoDO.getShopInteriorPhoto());
+ }
+ }
return response;
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java
index 03b389bef..6bd8c39f0 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java
@@ -1,5 +1,7 @@
package com.cool.store.service.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.cool.store.dao.*;
import com.cool.store.entity.*;
import com.cool.store.enums.ErrorCodeEnum;
@@ -10,14 +12,12 @@ import com.cool.store.exception.ServiceException;
import com.cool.store.request.*;
import com.cool.store.service.DecorationDesignInfoService;
import com.cool.store.utils.poi.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -40,6 +40,8 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ
private ShopStageInfoDAO shopStageInfoDAO;
@Resource
private LineInfoDAO lineInfoDAO;
+ @Resource
+ private BuildInformationDAO buildInformationDAO;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -277,8 +279,28 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ
if (shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus())) {
shopStageInfoDAO.updateShopStageInfo(shopInfoDO.getId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123);
}
+ // 覆盖建店资料中的门头照和内景照
+ BuildInformationDO buildInformation = BuildInformationDO.builder().shopId(request.getShopId()).doorPhoto(buildJson(request.getShopDoorwayPhotoUrl()))
+ .inStorePhoto(buildJson(request.getShopInteriorPhotoUrl())).build();
+ buildInformationDAO.updateByShopIdSelective(buildInformation);
return true;
}
+ public String buildJson(List urls) {
+ if (CollectionUtils.isEmpty(urls)) {
+ return null;
+ }
+ JSONArray jsonArray = new JSONArray();
+ for (String url : urls) {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("url", url);
+ jsonObject.put("type", extractImageSuffix(url));
+ jsonArray.add(jsonObject);
+ }
+ return jsonArray.toJSONString();
+ }
+ public String extractImageSuffix(String url) {
+ return url.substring(url.lastIndexOf(".") + 1);
+ }
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseServiceImpl.java
index 7f5c7ac66..036c02713 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseServiceImpl.java
@@ -1,19 +1,23 @@
package com.cool.store.service.impl;
import com.alibaba.fastjson.JSON;
+import com.cool.store.constants.CommonConstants;
import com.cool.store.constants.RedisConstant;
import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.SysRoleDO;
import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.enums.JoinModeEnum;
import com.cool.store.enums.Role;
import com.cool.store.enums.UserStatusEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.SysRoleMapper;
import com.cool.store.service.EnterpriseService;
import com.cool.store.userholder.CurrentUser;
+import com.cool.store.userholder.RefreshUser;
import com.cool.store.utils.RedisUtilPool;
import com.cool.store.utils.poi.DateUtils;
+import com.cool.store.utils.poi.constant.Constants;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.crypto.RandomNumberGenerator;
@@ -48,7 +52,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
private String eid;
@Override
- public String getAccessToken(String mobile) {
+ public CurrentUser getLoginInfo(String mobile) {
CurrentUser currentUser = new CurrentUser();
EnterpriseUserDO enterpriseUser = enterpriseUserDAO.selectByMobile(mobile);
if (Objects.isNull(enterpriseUser)){
@@ -107,8 +111,36 @@ public class EnterpriseServiceImpl implements EnterpriseService {
currentUser.setAppType("qw_self_dkf");
currentUser.setUnionid(enterpriseUser.getUnionid());
currentUser.setUserType(enterpriseUser.getUserType());
- redisUtilPool.setString(RedisConstant.ACCESS_TOKEN_PREFIX + currentUser.getAccessToken(), JSON.toJSONString(currentUser), 24 * 60 * 60);
- return currentUser.getAccessToken();
+ redisUtilPool.setString(RedisConstant.ACCESS_TOKEN_PREFIX + currentUser.getAccessToken(), JSON.toJSONString(currentUser), CommonConstants.ACTION_TOKEN_EXPIRE);
+ return currentUser;
+ }
+
+ @Override
+ public RefreshUser getRefreshUser(String userId, String mobile) {
+ if (StringUtils.isBlank(mobile)) {
+ EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId);
+ mobile = userInfo.getMobile();
+ }
+ String refreshToken = getToken();
+ RefreshUser refreshUser = new RefreshUser(userId, refreshToken, mobile);
+ redisUtilPool.setString(RedisConstant.REFRESH_TOKEN_PREFIX + refreshToken, JSON.toJSONString(refreshUser), CommonConstants.REFRESH_TOKEN_EXPIRE);
+ return refreshUser;
+ }
+
+ @Override
+ public void checkUser(String userId,Integer joinMode) {
+ EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId);
+ if (userInfo !=null){
+ //校验当前人员是否是加盟部 581
+ String departments = userInfo.getDepartments();
+ //如果departments包含/581/ 加盟部
+ if (com.cool.store.utils.poi.StringUtils.isNotBlank(departments) && departments.contains("/581/")) {
+ //加盟部 FRANCHISE_COMPANIES
+ if (!JoinModeEnum.isFranchise(joinMode)){
+ throw new ServiceException(ErrorCodeEnum.JOIN_MODE_NOT_ALLOW_OPERATE);
+ }
+ }
+ }
}
public static void main(String[] args) {
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
index 2db3f5441..cc40863fd 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
@@ -88,6 +88,8 @@ public class LineServiceImpl implements LineService {
private RegionQrcodeConfigDao regionQrcodeConfigDao;
@Resource
QualificationsInfoDAO qualificationsInfoDAO;
+ @Resource
+ EnterpriseService enterpriseService;
@Override
@@ -514,6 +516,7 @@ public class LineServiceImpl implements LineService {
public Boolean addLine(AddLineRequest addLineRequest, LoginUserInfo userInfo) {
//必填参数
log.info("addLine:{}", JSONObject.toJSONString(addLineRequest));
+ enterpriseService.checkUser(userInfo.getUserId(), addLineRequest.getJoinMode());
if (!StringUtil.isNoneBlank(addLineRequest.getMobile(), addLineRequest.getUserName())) {
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageIssueService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageIssueService.java
new file mode 100644
index 000000000..b96dc18f7
--- /dev/null
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageIssueService.java
@@ -0,0 +1,78 @@
+package com.cool.store.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.dao.MessageTemplateDAO;
+import com.cool.store.entity.MessageTemplateDO;
+import com.cool.store.entity.StoreMessageDO;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.exception.ServiceException;
+import com.cool.store.vo.notice.StoreMessageVO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.messaging.MessagingException;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ *
+ * 消息下发 服务类
+ *
+ *
+ * @author wangff
+ * @since 2025/9/5
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class MessageIssueService {
+ private final MessageTemplateDAO messageTemplateDAO;
+ private final SimpMessagingTemplate simpMessagingTemplate;
+
+ /**
+ * 下发即时通知消息
+ *
+ * @param list 门店消息列表
+ */
+ @Async("generalThreadPool")
+ public void issueMessage(List list) {
+ if (CollectionUtils.isEmpty(list)) return;
+ log.info("下发即时通知, messageList:{}", JSONObject.toJSONString(list));
+ try {
+ Set messageTemplateIds = CollStreamUtil.toSet(list, StoreMessageDO::getMessageTemplateId);
+ List messageTemplateList = messageTemplateDAO.getByIds(new ArrayList<>(messageTemplateIds));
+ Map messageTemplateMap = CollStreamUtil.toMap(messageTemplateList, MessageTemplateDO::getId, v -> v);
+
+ for (StoreMessageDO storeMessageDO : list) {
+ if (StringUtils.isNotBlank(storeMessageDO.getOperatorList())) {
+ String[] userIds = storeMessageDO.getOperatorList().split(",");
+ if (ArrayUtil.isNotEmpty(userIds)) {
+ MessageTemplateDO messageTemplateDO = messageTemplateMap.get(storeMessageDO.getMessageTemplateId());
+ if (Objects.isNull(messageTemplateDO)) {
+ throw new ServiceException(ErrorCodeEnum.MESSAGE_NOT_EXIST);
+ }
+ StoreMessageVO storeMessageVO = BeanUtil.toBean(storeMessageDO, StoreMessageVO.class);
+ BeanUtil.copyProperties(messageTemplateDO, storeMessageVO, "id");
+ String message = JSONObject.toJSONString(storeMessageVO);
+ for (String userId : userIds) {
+ try {
+ simpMessagingTemplate.convertAndSend("/queue/message/" + userId, message);
+ } catch (MessagingException e) {
+ log.info("即时通知下发异常, userId:{}, error:{}", userId, e.getMessage());
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.info("即时通知下发异常", e);
+ }
+ }
+}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
index a47132d08..311d2ab92 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
@@ -3,7 +3,6 @@ package com.cool.store.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.LoginUserInfo;
-import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dao.*;
import com.cool.store.dto.notice.CommonDTO;
import com.cool.store.dto.notice.MessageTemplateCountDTO;
@@ -36,7 +35,6 @@ import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.BeanUtils;
import org.springframework.core.task.TaskExecutor;
import org.springframework.scheduling.annotation.Async;
@@ -83,6 +81,8 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
TaskExecutor noticeThreadPool;
@Resource
HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
+ @Resource
+ MessageIssueService messageIssueService;
@@ -188,6 +188,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
List storeAreaDTOS = getStoreRange(request.getStoreInfoList());
List storeIds = storeAreaDTOS.stream().map(StoreAreaDTO::getStoreId).collect(Collectors.toList());
Map> authUser = getAuthUser(request.getUserInfoList(), storeIds);
+ List realtimeMessageList = new ArrayList<>();
list.stream().forEach(x -> {
List result = new ArrayList<>();
storeAreaDTOS.forEach(y->{
@@ -209,6 +210,9 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
result.add(storeMessageDO);
});
storeMessageDAO.batchInsert(result);
+ if (MatterTypeEnum.REALTIME.getCode().equals(request.getMatterType())) {
+ realtimeMessageList.addAll(result);
+ }
});
//存在第一个成功 第二个失败 会有问题 todo
@@ -245,6 +249,8 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
openIdList.forEach(x->{
wechatTemplateService.sendMiniAppTemplate(x, WechatTemplateEnum.NEW_QUESTION_NOTICE,data,"pages/notification/index");
});
+ // 即时消息下发
+ messageIssueService.issueMessage(realtimeMessageList);
} catch (Exception e) {
log.info("发布流程异常 e:{}",e.getMessage());
} finally {
@@ -395,6 +401,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
batchPublishRequest.setIds(Arrays.asList(messageTemplateDO.getId()));
batchPublishRequest.setStoreInfoList(JSONObject.parseArray(storeInfo, CommonDTO.class));
batchPublishRequest.setUserInfoList(JSONObject.parseArray(userInfo, CommonDTO.class));
+ batchPublishRequest.setMatterType(matterConfig.getMatterType());
try {
batchPublishMessageTemplate(batchPublishRequest,"");
} catch (ServiceException e) {
@@ -495,9 +502,9 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
}
@Override
- public List getModuleList(String storeId,PartnerUserInfoVO userInfoVO) {
+ public List getModuleList(String storeId,String mobile) {
List moduleAndMatterList = ModuleAndMatterVO.getModuleAndMatterList();
- EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(userInfoVO.getMobile());
+ EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile);
if (enterpriseUserDO == null){
enterpriseUserDO = new EnterpriseUserDO();
}
@@ -540,7 +547,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
}
@Override
- public Boolean readMessage(Long id, PartnerUserInfoVO userInfoVO) {
+ public Boolean readMessage(Long id, String mobile) {
StoreMessageDO message = storeMessageDAO.getById(id);
if (ProcessStatusEnum.PROCESSED.getCode().equals(message.getProcessStatus())){
log.info("当前消息已读已处理：{}",JSONObject.toJSONString( message));
@@ -552,7 +559,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
if (ProcessTypeEnum.READ.getCode().equals(template.getProcessType())){
message.setProcessStatus(ProcessStatusEnum.PROCESSED.getCode());
message.setProcessTime(new Date());
- EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(userInfoVO.getMobile());
+ EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile);
if (enterpriseUserDO != null){
message.setActualOperatorId(enterpriseUserDO.getId());
message.setActualOperatorName(enterpriseUserDO.getName());
@@ -563,15 +570,15 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
}
@Override
- public Boolean handleMessage(Long id, PartnerUserInfoVO userInfoVO) {
- log.info("handleMessage request:{}，处理人：{}", JSONObject.toJSONString(id), userInfoVO.getUsername());
+ public Boolean handleMessage(Long id, String userName,String mobile) {
+ log.info("handleMessage request:{}，处理人：{}", JSONObject.toJSONString(id), userName);
StoreMessageDO message = storeMessageDAO.getById(id);
if (message==null){
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}
message.setProcessStatus(ProcessStatusEnum.PROCESSED.getCode());
message.setProcessTime(new Date());
- EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(userInfoVO.getMobile());
+ EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile);
if (enterpriseUserDO != null){
message.setActualOperatorId(enterpriseUserDO.getId());
message.setActualOperatorName(enterpriseUserDO.getName());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
index c658e1f14..20778e775 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
@@ -293,6 +293,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
//初始化数据
preparationService.licenseCompleted(shopId);
preparationService.sysStoreCompleted(shopId);
+ preparationService.businessLicenseAndBuildStoreCompleted(shopId);
preparationService.buildStoreAndDecorationComplete(shopId);
preparationService.selectSiteAndBuildStoreComplete(shopId);
preparationService.buildStoreComplete(shopId);
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java
index b1c786bae..91f0e1398 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java
@@ -220,9 +220,25 @@ public class PreparationServiceImpl implements PreparationService {
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
if (flag3) {
List list = new ArrayList<>();
- list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230);
+ shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list);
+ }
+ }
+ }
+
+ @Override
+ public void businessLicenseAndBuildStoreCompleted(Long shopId) {
+ List shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null);
+ if (CollectionUtils.isNotEmpty(shopStageInfo)) {
+ Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data));
+ boolean flag1 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus().
+ equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
+ boolean flag2 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().
+ equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus());
+ if (flag1 && flag2) {
+ List list = new ArrayList<>();
+ list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240);
shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list);
}
@@ -345,10 +361,12 @@ public class PreparationServiceImpl implements PreparationService {
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_1.getShopSubStage()).getShopSubStageStatus());
Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus().
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
+ Boolean flag4 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().
+ equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus());
- log.info("selectSiteAndBuildStoreComplete flag2->{} flag3->{}",flag2,flag3);
+ log.info("selectSiteAndBuildStoreComplete flag2->{} flag3->{} flag4->{}",flag2,flag3, flag4);
//都完成了 状态修改
- if (flag2 && flag3) {
+ if (flag2 && flag3 && flag4) {
shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null,null);
}
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index ef44ca211..9f4a09703 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -110,6 +110,8 @@ public class ShopServiceImpl implements ShopService {
DecorationDesignInfoDAO decorationDesignInfoDAO;
@Resource
StoreService storeService;
+ @Resource
+ EnterpriseService enterpriseService;
@Override
@@ -330,6 +332,7 @@ public class ShopServiceImpl implements ShopService {
if (StringUtils.isBlank(request.getInvestmentManagerUserId())) {
request.setInvestmentManagerUserId(userId);
}
+ enterpriseService.checkUser(userId, request.getJoinMode());
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(request.getLineId());
if (lineInfo.getWorkflowSubStageStatus() < WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode()) {
throw new ServiceException(ErrorCodeEnum.LINE_STATUS_NOT_ALLOW_OPERATE);
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
index e6c61a1a1..ac7bb60cd 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
@@ -273,6 +273,18 @@ public class SyncDataServiceImpl implements SyncDataService {
} catch (Exception e) {
log.info("getUrl error:{},JSON:{}", e.getMessage(), json);
}
+ return getUrlListByComma(json);
+ }
+
+ private static List getUrlListByComma(String str) {
+ if (StringUtils.isBlank(str)) {
+ return null;
+ }
+ try {
+ return Arrays.asList(str.split(","));
+ } catch (Exception e) {
+ log.info("getUrlListByComma error:{},str:{}", e.getMessage(), str);
+ }
return null;
}
@@ -289,43 +301,31 @@ public class SyncDataServiceImpl implements SyncDataService {
if (String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
//M10001
if (shopCode.matches("M\\d*")) {
- return partnershipSignatorySecondIsNull
- ? "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
- : "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+ return "MX" + shopInfoDO.getShopName();
}
//FS10001
if (shopCode.matches("FS\\d*")) {
- return partnershipSignatorySecondIsNull
- ? "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
- : "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+ return "FS" + shopInfoDO.getShopName();
}
// MS10001
if (shopCode.matches("MS\\d*")) {
- return partnershipSignatorySecondIsNull
- ? "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
- : "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+ return "MS" + shopInfoDO.getShopName();
}
// S10001
if (shopCode.matches("S\\d*")) {
- return partnershipSignatorySecondIsNull
- ? "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
- : "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+ return "S" + shopInfoDO.getShopName();
}
// ZX0001
if (shopCode.matches("ZX\\d*")) {
return "ZX" + shopInfoDO.getShopName();
}
if(shopCode.matches("HL\\d*")){
- return partnershipSignatorySecondIsNull
- ? "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
- : "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+ return "HL" + shopInfoDO.getShopName();
}
}
if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
if (shopCode.matches("MZGM\\d*")) {
- return partnershipSignatorySecondIsNull
- ? "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
- : "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+ return "MZGM" + shopInfoDO.getShopName();
}
if (shopCode.matches("MZGS\\d*")) {
return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName();
@@ -333,19 +333,13 @@ public class SyncDataServiceImpl implements SyncDataService {
}
if (String.valueOf(FranchiseBrandEnum.ZJS.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
if (shopCode.matches("LX\\d*")) {
- return partnershipSignatorySecondIsNull
- ? "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
- : "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+ return "LX" + shopInfoDO.getShopName();
}
if (shopCode.matches("X\\d*")) {
- return partnershipSignatorySecondIsNull
- ? "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
- : "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+ return "X" + shopInfoDO.getShopName();
}
if (shopCode.matches("Q\\d*")) {
- return partnershipSignatorySecondIsNull
- ? "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
- : "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+ return "Q" + shopInfoDO.getShopName();
}
if (shopCode.matches("Z\\d*")) {
return FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName();
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
index dac429721..e90791f27 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
@@ -160,6 +160,9 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
PointDetailInfoDO pointDetail = pointDetailDAO.getPointDetailInfoByPointId(shopInfo.getPointId());
if (info != null){
storeMasterDTO.setArea(info.getProvince()+info.getCity()+info.getDistrict());
+ storeMasterDTO.setProvince(info.getProvince());
+ storeMasterDTO.setCity(info.getCity());
+ storeMasterDTO.setDistrict(info.getDistrict());
storeMasterDTO.setTown(info.getTownship());
storeMasterDTO.setStoreAddress(info.getAddress());
storeMasterDTO.setLocationAddress(info.getAddress());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdBigDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdBigDataServiceImpl.java
index ee6331d45..6ac1a03a0 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdBigDataServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdBigDataServiceImpl.java
@@ -3,12 +3,10 @@ package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
+import com.cool.store.request.bigdata.LatestOrderDateRequest;
import com.cool.store.request.bigdata.ProfitDataRequest;
import com.cool.store.request.oppty.CityRequest;
-import com.cool.store.response.bigdata.ActDataResponse;
-import com.cool.store.response.bigdata.ApiResponse;
-import com.cool.store.response.bigdata.ProfitDataResponse;
-import com.cool.store.response.bigdata.ProfitRateResponse;
+import com.cool.store.response.bigdata.*;
import com.cool.store.response.oppty.CityResponse;
import com.cool.store.response.oppty.OpportunityApiResponse;
import com.cool.store.response.oppty.OpportunityDetailResponse;
@@ -96,6 +94,15 @@ public class ThirdBigDataServiceImpl implements ThirdBigDataService {
return executeApiCall(url, requestBody, ActDataResponse.class);
}
+ @Override
+ public List getLatestOrderDate(LatestOrderDateRequest requestBody) {
+ String url = apiUrl + "api/web/v1/buy/latest_buy_date";
+ JavaType javaType = objectMapper.getTypeFactory()
+ .constructParametricType(ApiPageResponse.class, LatestOrderDateResponse.class);
+ ApiPageResponse response = executeApiCallWithGenericType(url, requestBody, javaType);
+ return response.getList();
+ }
+
private T executeApiCall(String url, Object requestBody, Class responseType) {
// 1. 打印请求前日志
@@ -136,6 +143,44 @@ public class ThirdBigDataServiceImpl implements ThirdBigDataService {
}
}
+ private T executeApiCallWithGenericType(String url, Object requestBody, JavaType responseType) {
+ // 1. 打印请求前日志
+ logRequest(url, requestBody);
+
+ try {
+ Request request = buildRequest(requestBody, url);
+
+ try (Response response = okHttpClient.newCall(request).execute()) {
+ // 2. 获取原始响应内容
+ String responseBody = response.body().string();
+
+ // 3. 打印响应日志
+ logResponse(url, response.code(), responseBody);
+
+ if (!response.isSuccessful()) {
+ throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR,
+ "HTTP请求失败，状态码: " + response.code());
+ }
+
+ // 4. 解析响应
+ JavaType javaType = objectMapper.getTypeFactory()
+ .constructParametricType(OpportunityApiResponse.class, responseType);
+
+ OpportunityApiResponse apiResponse = objectMapper.readValue(responseBody, javaType);
+
+ if (apiResponse.getCode() != 0) {
+ throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, apiResponse.getMsg());
+ }
+
+ return apiResponse.getData();
+ }
+ } catch (ServiceException e) {
+ throw e;
+ } catch (Exception e) {
+ log.error("API调用异常 - URL: {}, 错误: {}", url, e.getMessage(), e);
+ throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, "接口调用异常: " + e.getMessage());
+ }
+ }
private Request buildRequest(Object requestBody, String url) {
Map params = JsonUtils.parseJsonToMap(JSONObject.toJSONString(requestBody));
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/login/LoginBaseService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/login/LoginBaseService.java
new file mode 100644
index 000000000..c7de70b03
--- /dev/null
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/login/LoginBaseService.java
@@ -0,0 +1,106 @@
+package com.cool.store.service.login;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.constants.CommonConstants;
+import com.cool.store.constants.RedisConstant;
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
+import com.cool.store.dao.EnterpriseUserDAO;
+import com.cool.store.dto.login.UserLoginDTO;
+import com.cool.store.dto.login.UserRefreshLoginDTO;
+import com.cool.store.entity.EnterpriseUserDO;
+import com.cool.store.entity.login.UserLoginDO;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.EnterpriseService;
+import com.cool.store.userholder.CurrentUser;
+import com.cool.store.userholder.RefreshUser;
+import com.cool.store.utils.RedisUtilPool;
+import com.cool.store.utils.poi.constant.Constants;
+import com.cool.store.vo.login.UserBaseInfoVO;
+import com.cool.store.vo.login.UserLoginVO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.MessageFormat;
+import java.time.LocalDate;
+
+/**
+ *
+ * 登录基础服务类
+ *
+ *
+ * @author wangff
+ * @since 2025/9/3
+ */
+@Slf4j
+@Service
+public abstract class LoginBaseService implements LoginStrategy {
+ @Resource
+ private RedisUtilPool redisUtilPool;
+ @Resource
+ private EnterpriseUserDAO enterpriseUserDAO;
+ @Resource
+ private EnterpriseService enterpriseService;
+
+ /**
+ * 策略登录实现方法
+ */
+ public abstract ResponseResult userLogin(UserLoginDTO param, UserLoginDO userLoginDO);
+
+ @Override
+ public ResponseResult login(UserLoginDTO param) {
+ log.info("login:{}", JSONObject.toJSONString(param));
+ String errorPasswordCountKey = MessageFormat.format(RedisConstant.ERROR_PASSWORD_COUNT_KEY, LocalDate.now(), param.getMobile());
+ String errorCount = redisUtilPool.getString(errorPasswordCountKey);
+ //判断密码错误次数
+ if (StringUtils.isNotBlank(errorCount)) {
+ if (Integer.parseInt(errorCount) >= CommonConstants.MAX_ERROR_PASSWORD_COUNT) {
+ return ResponseResult.fail(ErrorCodeEnum.PASSWORD_ERROR_MAX_COUNT, errorCount);
+ }
+ }
+ EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(param.getMobile());
+ UserLoginDO userLoginDO = enterpriseUserDAO.getUserLoginByUnionid(enterpriseUserDO.getUnionid());
+ return userLogin(param, userLoginDO);
+ }
+
+ @Override
+ public ResponseResult refreshLogin(UserRefreshLoginDTO param) {
+ String refreshTokenKey = RedisConstant.REFRESH_TOKEN_PREFIX + param.getRefreshToken();
+ String refreshUserStr = redisUtilPool.getString(refreshTokenKey);
+ if (StringUtils.isBlank(refreshUserStr)) {
+ return ResponseResult.fail(ErrorCodeEnum.REFRESH_TOKEN_INVALID);
+ }
+ RefreshUser refreshUser = JSONObject.parseObject(refreshUserStr, RefreshUser.class);
+ if (StringUtils.isBlank(refreshUser.getMobile())) {
+ return ResponseResult.fail(ErrorCodeEnum.REFRESH_TOKEN_INVALID);
+ }
+ UserLoginDO userLoginDO = new UserLoginDO(refreshUser.getUserId(), refreshUser.getMobile(), null);
+ return ResponseResult.success(getUserLoginInfo(userLoginDO));
+ }
+
+ @Override
+ public ResponseResult logout() {
+ LoginUserInfo currentUser = CurrentUserHolder.getUser();
+ String accessToken = currentUser.getAccessToken();
+ String key = RedisConstant.ACCESS_TOKEN_PREFIX + accessToken;
+ redisUtilPool.delKey(key);
+ return ResponseResult.success();
+ }
+
+ /**
+ * 获取登录accessToken
+ *
+ * @param userLoginDO 用户登录信息
+ * @return accessToken
+ */
+ public UserLoginVO getUserLoginInfo(UserLoginDO userLoginDO) {
+ CurrentUser currentUser = enterpriseService.getLoginInfo(userLoginDO.getMobile());
+ UserBaseInfoVO userBAseInfoVO = BeanUtil.toBean(currentUser, UserBaseInfoVO.class);
+ RefreshUser refreshUser = enterpriseService.getRefreshUser(userLoginDO.getUserId(), userLoginDO.getMobile());
+ return new UserLoginVO(currentUser.getAccessToken(), refreshUser.getRefreshToken(), CommonConstants.ACTION_TOKEN_EXPIRE, userBAseInfoVO);
+ }
+}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/login/LoginStrategy.java b/coolstore-partner-service/src/main/java/com/cool/store/service/login/LoginStrategy.java
new file mode 100644
index 000000000..fefd75d54
--- /dev/null
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/login/LoginStrategy.java
@@ -0,0 +1,30 @@
+package com.cool.store.service.login;
+
+import com.cool.store.dto.login.UserLoginDTO;
+import com.cool.store.dto.login.UserRefreshLoginDTO;
+import com.cool.store.response.ResponseResult;
+
+/**
+ *
+ * 登录策略
+ *
+ *
+ * @author wangff
+ * @since 2025/9/3
+ */
+public interface LoginStrategy {
+ /**
+ * 登录基础方法
+ */
+ ResponseResult login(UserLoginDTO param);
+
+ /**
+ * refreshToken登录
+ */
+ ResponseResult refreshLogin(UserRefreshLoginDTO param);
+
+ /**
+ * 登出
+ */
+ ResponseResult logout();
+}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/login/impl/PasswordLoginServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/login/impl/PasswordLoginServiceImpl.java
new file mode 100644
index 000000000..f863e543d
--- /dev/null
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/login/impl/PasswordLoginServiceImpl.java
@@ -0,0 +1,55 @@
+package com.cool.store.service.login.impl;
+
+import com.aliyun.core.utils.StringUtils;
+import com.cool.store.constants.CommonConstants;
+import com.cool.store.constants.RedisConstant;
+import com.cool.store.dto.login.UserLoginDTO;
+import com.cool.store.entity.login.UserLoginDO;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.login.LoginBaseService;
+import com.cool.store.utils.Md5Utils;
+import com.cool.store.utils.RedisUtilPool;
+import com.cool.store.utils.poi.constant.Constants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.text.MessageFormat;
+import java.time.LocalDate;
+
+/**
+ *
+ * 密码登录服务实现类
+ *
+ *
+ * @author wangff
+ * @since 2025/9/4
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class PasswordLoginServiceImpl extends LoginBaseService {
+ private final RedisUtilPool redisUtilPool;
+
+ @Override
+ public ResponseResult userLogin(UserLoginDTO param, UserLoginDO userLoginDO) {
+ if (StringUtils.isBlank(param.getPassword())) {
+ return ResponseResult.fail(ErrorCodeEnum.PASSWORD_MISSING);
+ }
+ if (StringUtils.isBlank(userLoginDO.getPassword())) {
+ return ResponseResult.fail(ErrorCodeEnum.IMPROVE_USER_INFO);
+ }
+ String password = Md5Utils.md5(param.getPassword() + CommonConstants.USER_AUTH_KEY);
+ if (!password.equals(userLoginDO.getPassword())) {
+ String errorPasswordCountKey = MessageFormat.format(RedisConstant.ERROR_PASSWORD_COUNT_KEY, LocalDate.now(), param.getMobile());
+ Long errorNum = redisUtilPool.incrby(errorPasswordCountKey, 1);
+ redisUtilPool.expire(errorPasswordCountKey, 24 * 60 * 60);
+ if(errorNum == 1){
+ return ResponseResult.fail(ErrorCodeEnum.PASSWORD_ERROR);
+ }
+ return ResponseResult.fail(ErrorCodeEnum.PASSWORD_ERROR_MULTI, errorNum.toString());
+ }
+ return ResponseResult.success(getUserLoginInfo(userLoginDO));
+ }
+}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java b/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java
index f4262d9e7..b08d231e6 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java
@@ -220,6 +220,4 @@ public class Constants
public static final String WANG_LEI_JOB_NUMBER = "19060164";
-
-
}
diff --git a/coolstore-partner-web/pom.xml b/coolstore-partner-web/pom.xml
index 22e75fcb9..fe6d27e01 100644
--- a/coolstore-partner-web/pom.xml
+++ b/coolstore-partner-web/pom.xml
@@ -35,6 +35,65 @@
+
+
+ dev
+
+ dev
+
+
+
+ dev2
+
+ dev2
+
+
+
+ local
+
+ true
+
+
+ local
+
+
+
+ test
+
+ test
+
+
+
+ test3
+
+ test3
+
+
+
+ ab
+
+ ab
+
+
+
+ online
+
+ online
+
+
+
+ hd
+
+ hd
+
+
+
+ zcb
+
+ zcb
+
+
+
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/PartnerWebApplication.java b/coolstore-partner-web/src/main/java/com/cool/store/PartnerWebApplication.java
index 9f1f66664..05d745b0d 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/PartnerWebApplication.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/PartnerWebApplication.java
@@ -40,4 +40,16 @@ public class PartnerWebApplication {
return defaultDataSourceProperties().initializeDataSourceBuilder().type(HikariDataSource.class).build();
}
+ @Bean
+ @ConfigurationProperties("platform.datasource")
+ public DataSourceProperties platformDataSourceProperties() {
+ return new DataSourceProperties();
+ }
+
+ @Bean
+ @ConfigurationProperties("spring.datasource.hikari")
+ public DataSource platformDataSource() {
+ return platformDataSourceProperties().initializeDataSourceBuilder().type(HikariDataSource.class).build();
+ }
+
}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/aspect/DataSourceAspect.java b/coolstore-partner-web/src/main/java/com/cool/store/aspect/DataSourceAspect.java
new file mode 100644
index 000000000..87e0f0a85
--- /dev/null
+++ b/coolstore-partner-web/src/main/java/com/cool/store/aspect/DataSourceAspect.java
@@ -0,0 +1,37 @@
+package com.cool.store.aspect;
+
+import com.cool.store.annotation.PlatformDB;
+import com.cool.store.datasource.DataSourceContextHolder;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * 数据源切换 切面
+ *
+ *
+ * @author wangff
+ * @since 2025/9/4
+ */
+@Aspect
+@Component
+public class DataSourceAspect {
+
+ @Before("@annotation(platformDB)")
+ public void before(PlatformDB platformDB) {
+ DataSourceContextHolder.setDataSourceType("platform");
+ }
+
+ @After("@annotation(platformDB)")
+ public void after(PlatformDB platformDB) {
+ DataSourceContextHolder.clearDataSourceType();
+ }
+
+ @AfterThrowing("@annotation(platformDB)")
+ public void afterThrowing(PlatformDB platformDB) {
+ DataSourceContextHolder.clearDataSourceType();
+ }
+}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
index 5fb922201..7f0e14992 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
@@ -60,7 +60,8 @@ public class SignValidateFilter implements Filter {
"/zxjp/**/api/audit/result",
"/zxjp/**/api/license",
"/zxjp/mini/line/getRegionPayPic",
- "/zxjp/mini/miniProgram/getUserInfoByToken"
+ "/zxjp/mini/miniProgram/getUserInfoByToken",
+ "/zxjp/ws/**"
);
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
index 2115f4f26..93d16ade2 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
@@ -52,7 +52,10 @@ public class TokenValidateFilter implements Filter {
"/zxjp/pc/sysRole/**",
"/zxjp/**/api/audit/result",
"/zxjp/pc/video/**",
- "/zxjp/**/api/license"
+ "/zxjp/**/api/license",
+ "/zxjp/pc/v3/login/accountLogin",
+ "/zxjp/pc/v3/login/refreshLogin",
+ "/zxjp/ws/**"
);
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/websocket/WebSocketConfig.java b/coolstore-partner-web/src/main/java/com/cool/store/config/websocket/WebSocketConfig.java
new file mode 100644
index 000000000..79118b4b2
--- /dev/null
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/websocket/WebSocketConfig.java
@@ -0,0 +1,72 @@
+package com.cool.store.config.websocket;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+/**
+ *
+ * WebSocket配置类
+ *
+ *
+ * @author wangff
+ * @since 2025/9/2
+ */
+@Configuration
+@EnableWebSocketMessageBroker
+@Slf4j
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+ @Override
+ public void registerStompEndpoints(StompEndpointRegistry registry) {
+ registry.addEndpoint("/ws/zxzs")
+ .setAllowedOrigins("*")
+ .withSockJS(); // 启用SockJS支持
+ }
+
+ @Override
+ public void configureMessageBroker(MessageBrokerRegistry registry) {
+ // 配置消息代理
+ registry.enableSimpleBroker("/topic", "/queue") // 启用简单代理，用于广播和点对点消息
+ .setHeartbeatValue(new long[]{0, 10000})
+ .setTaskScheduler(webSocketTaskScheduler());
+ registry.setApplicationDestinationPrefixes("/app"); // 设置应用程序端点前缀
+// registry.setUserDestinationPrefix("/user");
+ }
+
+ @Bean
+ public TaskScheduler webSocketTaskScheduler() {
+ ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
+ taskScheduler.setPoolSize(1);
+ taskScheduler.setThreadNamePrefix("websocket-heartbeat-");
+ taskScheduler.initialize();
+ return taskScheduler;
+ }
+
+// @Override
+// public void configureClientInboundChannel(ChannelRegistration registration) {
+// registration.interceptors(new ChannelInterceptor() {
+// @Override
+// public Message preSend(Message message, MessageChannel channel) {
+// StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message);
+//
+// if (StompCommand.CONNECT.equals(accessor.getCommand())) {
+// // 从STOMP头部获取login字段作为用户标识
+// String login = accessor.getLogin();
+// log.info("用户login:{}", login);
+// if (login != null && !login.isEmpty()) {
+// // 设置用户身份
+// accessor.setUser(() -> login);
+// }
+// }
+// return message;
+// }
+// });
+// }
+}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LoginController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LoginController.java
new file mode 100644
index 000000000..9eb1b27c7
--- /dev/null
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LoginController.java
@@ -0,0 +1,47 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.dto.login.UserLoginDTO;
+import com.cool.store.dto.login.UserRefreshLoginDTO;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.login.LoginBaseService;
+import com.cool.store.service.login.LoginStrategy;
+import com.cool.store.utils.SpringContextUtil;
+import com.cool.store.vo.login.UserLoginVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 登录 前端控制器
+ *
+ *
+ * @author wangff
+ * @since 2025/9/4
+ */
+@Api(tags = "登录")
+@RestController
+@RequestMapping("/pc/v3/login")
+@RequiredArgsConstructor
+public class LoginController {
+ private final LoginBaseService loginBaseService;
+
+ @ApiOperation("账号密码登录")
+ @PostMapping("/accountLogin")
+ public ResponseResult accountLogin(@RequestBody UserLoginDTO param) {
+ return SpringContextUtil.getBean(param.getLoginType().getClazzName(), LoginStrategy.class).login(param);
+ }
+
+ @ApiOperation("refresh登录")
+ @PostMapping("/refreshLogin")
+ public ResponseResult refreshLogin(@RequestBody UserRefreshLoginDTO param) {
+ return loginBaseService.refreshLogin(param);
+ }
+
+ @ApiOperation("登出")
+ @PostMapping("/logout")
+ public ResponseResult logout() {
+ return loginBaseService.logout();
+ }
+}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MessageTemplateController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MessageTemplateController.java
index e9a3e66f4..5b51d7a44 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MessageTemplateController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/MessageTemplateController.java
@@ -1,12 +1,12 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
import com.cool.store.dto.notice.NoticeDTO;
import com.cool.store.request.notice.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.MessageTemplateService;
-import com.cool.store.vo.notice.MessageTemplateDetailVO;
-import com.cool.store.vo.notice.StoreMessageDetailVO;
+import com.cool.store.vo.notice.*;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -87,5 +87,34 @@ public class MessageTemplateController {
return ResponseResult.success(messageTemplateService.revokeById(id,CurrentUserHolder.getUser()));
}
+ @ApiOperation("获取每个门店需要展示的模块")
+ @GetMapping("/getModuleListByStoreId")
+ public ResponseResult> getModuleListByStoreId(@RequestParam("id")String storeId) {
+ return ResponseResult.success(messageTemplateService.getModuleList(storeId, CurrentUserHolder.getUser().getMobile()));
+ }
+ @ApiOperation("获取消息详情")
+ @GetMapping("/getMessageDetail")
+ public ResponseResult getMessageDetail(@RequestParam("id")Long id) {
+ return ResponseResult.success(messageTemplateService.getMessageDetail(id));
+ }
+
+ @ApiOperation("待办列表/模块列表")
+ @PostMapping("/getStorePendingList")
+ public ResponseResult> getStorePendingList(@RequestBody StoreMessagePendingRequest request) {
+ return ResponseResult.success(messageTemplateService.getStorePendingList(request));
+ }
+
+ @ApiOperation("确认已读")
+ @GetMapping("/readMessage")
+ public ResponseResult readMessage(@RequestParam("id")Long id) {
+ return ResponseResult.success(messageTemplateService.readMessage(id, CurrentUserHolder.getUser().getMobile()));
+ }
+
+ @ApiOperation("确认已处理")
+ @GetMapping("/handleMessage")
+ public ResponseResult handleMessage(@RequestParam("id")Long id) {
+ LoginUserInfo user = CurrentUserHolder.getUser();
+ return ResponseResult.success(messageTemplateService.handleMessage(id, user.getName(), user.getMobile()));
+ }
}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java
new file mode 100644
index 000000000..c821855df
--- /dev/null
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java
@@ -0,0 +1,34 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.common.PageBasicInfo;
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.response.MiniShopsResponse;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.StoreService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * PC门店 前端控制器
+ *
+ *
+ * @author wangff
+ * @since 2025/9/9
+ */
+@Api(tags = "PC门店")
+@RestController
+@RequestMapping("/pc/stores")
+@RequiredArgsConstructor
+public class PCStoreController {
+ private final StoreService storeService;
+
+ @ApiOperation("当前用户门店列表")
+ @PostMapping("/userStoreList")
+ public ResponseResult> getCurrentUserStoreList(@RequestBody PageBasicInfo request) {
+ return ResponseResult.success(storeService.getStoreListByMobile(CurrentUserHolder.getUser().getMobile(), request.getPageNum(), request.getPageSize(), null, null));
+ }
+}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMessageTemplateController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMessageTemplateController.java
index 9d46ede11..b21257317 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMessageTemplateController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniMessageTemplateController.java
@@ -5,6 +5,7 @@ import com.cool.store.context.PartnerUserHolder;
import com.cool.store.request.notice.StoreMessagePendingRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.MessageTemplateService;
+import com.cool.store.vo.PartnerUserInfoVO;
import com.cool.store.vo.notice.MessageDetailVO;
import com.cool.store.vo.notice.ModuleAndMatterVO;
import com.cool.store.vo.notice.StoreMessageVO;
@@ -34,7 +35,7 @@ public class MiniMessageTemplateController {
@ApiOperation("获取每个门店需要展示的模块")
@GetMapping("/getModuleListByStoreId")
public ResponseResult> getModuleListByStoreId(@RequestParam("id")String storeId) {
- return ResponseResult.success(messageTemplateService.getModuleList(storeId, PartnerUserHolder.getUser()));
+ return ResponseResult.success(messageTemplateService.getModuleList(storeId, PartnerUserHolder.getUser().getMobile()));
}
@ApiOperation("获取消息详情")
@@ -52,13 +53,14 @@ public class MiniMessageTemplateController {
@ApiOperation("确认已读")
@GetMapping("/readMessage")
public ResponseResult readMessage(@RequestParam("id")Long id) {
- return ResponseResult.success(messageTemplateService.readMessage(id, PartnerUserHolder.getUser()));
+ return ResponseResult.success(messageTemplateService.readMessage(id, PartnerUserHolder.getUser().getMobile()));
}
@ApiOperation("确认已处理")
@GetMapping("/handleMessage")
public ResponseResult handleMessage(@RequestParam("id")Long id) {
- return ResponseResult.success(messageTemplateService.handleMessage(id, PartnerUserHolder.getUser()));
+ PartnerUserInfoVO user = PartnerUserHolder.getUser();
+ return ResponseResult.success(messageTemplateService.handleMessage(id, user.getUsername(), user.getMobile()));
}
}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopAccountController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopAccountController.java
index 0a8f5341a..e7982e7fa 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopAccountController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopAccountController.java
@@ -8,7 +8,6 @@ import com.cool.store.dto.ShopAccount.ShopAccountDTO;
import com.cool.store.request.GetPasswordDTO;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.*;
-import com.cool.store.vo.PartnerUserInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
@@ -95,7 +94,7 @@ public class MiniShopAccountController {
@ApiOperation("获取标品登录token")
@GetMapping("/getAccessToken")
public ResponseResult getAccessToken() {
- return ResponseResult.success(enterpriseService.getAccessToken(PartnerUserHolder.getUser().getMobile()));
+ return ResponseResult.success(enterpriseService.getLoginInfo(PartnerUserHolder.getUser().getMobile()).getAccessToken());
}
}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
index 26375991a..cce519796 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
@@ -1,5 +1,6 @@
package com.cool.store.job;
+import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants;
@@ -7,6 +8,7 @@ import com.cool.store.dao.*;
import com.cool.store.dto.*;
import com.cool.store.dto.decoration.ConstructionScheduleDTO;
import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO;
+import com.cool.store.dto.store.StoreOrderTimeDTO;
import com.cool.store.entity.*;
import com.cool.store.enums.*;
import com.cool.store.enums.point.ShopStatusEnum;
@@ -19,11 +21,14 @@ import com.cool.store.mapper.TrainingExperienceMapper;
import com.cool.store.mq.producer.SimpleMessageService;
import com.cool.store.mq.util.HttpRestTemplateService;
import com.cool.store.request.ZxjpApiRequest;
+import com.cool.store.request.bigdata.LatestOrderDateRequest;
import com.cool.store.request.xfsgFirstOrderListRequest;
+import com.cool.store.response.bigdata.LatestOrderDateResponse;
import com.cool.store.response.xfsgFirstOderListResponse;
import com.cool.store.service.*;
import com.cool.store.service.impl.CommonService;
import com.cool.store.utils.CoolDateUtils;
+import com.cool.store.utils.MDCUtils;
import com.cool.store.utils.NumberConverter;
import com.cool.store.utils.poi.DateUtils;
import com.cool.store.utils.poi.StringUtils;
@@ -40,6 +45,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
@@ -111,6 +117,10 @@ public class XxlJobHandler {
@Resource
PushService pushService;
+ @Resource
+ StoreDao storeDao;
+ @Resource
+ ThirdBigDataService thirdBigDataService;
/**
@@ -395,4 +405,56 @@ public class XxlJobHandler {
}
}
+ @XxlJob("latestOrderDate")
+ public void latestOrderDate() {
+ log.info("------start latestOrderDate------");
+ MDCUtils.put(CommonConstants.REQUEST_ID, UUID.randomUUID().toString());
+ String param = XxlJobHelper.getJobParam();
+ List storeStatus = null;
+ if (StringUtils.isNotBlank(param)) {
+ storeStatus = Arrays.asList(param.split(","));
+ }
+ boolean hasNext = true;
+ int pageNum = 1;
+ int pageSize = CommonConstants.BATCH_SIZE;
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ while (hasNext) {
+ PageHelper.startPage(pageNum, pageSize);
+ List storeList = storeDao.getAllStoreIdAndNum(storeStatus);
+ if (CollectionUtils.isEmpty(storeList)) {
+ break;
+ }
+ hasNext = storeList.size() >= pageSize;
+ List storeNums = CollStreamUtil.toList(storeList, StoreDO::getStoreNum);
+ Map storeIdMap = CollStreamUtil.toMap(storeList, StoreDO::getStoreNum, StoreDO::getStoreId);
+ LatestOrderDateRequest request = new LatestOrderDateRequest(1, pageSize, String.join(",", storeNums));
+ List resList = thirdBigDataService.getLatestOrderDate(request);
+ log.info("接口请求门店数量:{}，返回门店数:{}", storeList.size(), resList.size());
+ if (CollectionUtils.isNotEmpty(resList)) {
+ try {
+ List updateList = resList.stream()
+ .map(v -> {
+ Date date = parseDate(v, dateFormat);
+ return Objects.nonNull(date) ? new StoreOrderTimeDTO(storeIdMap.get(v.getStore_code()), date) : null;
+ })
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ storeDao.batchInsertOrUpdateOrderTime(updateList);
+ } catch (Exception e) {
+ log.error("获取最新订货时间失败", e);
+ }
+ }
+ pageNum++;
+ }
+ log.info("------end latestOrderDate------");
+ }
+
+ public Date parseDate(LatestOrderDateResponse v, DateFormat format) {
+ try {
+ return format.parse(v.getLatest_buy_date());
+ } catch (ParseException e) {
+ log.error("日期转化失败,storeCode:{},latestBuyDate:{}", v.getStore_code(), v.getLatest_buy_date());
+ }
+ return null;
+ }
}
diff --git a/coolstore-partner-web/src/main/resources/application-ab.properties b/coolstore-partner-web/src/main/resources/application-ab.properties
index 802a16302..3733c2acc 100644
--- a/coolstore-partner-web/src/main/resources/application-ab.properties
+++ b/coolstore-partner-web/src/main/resources/application-ab.properties
@@ -4,6 +4,10 @@ default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3
default.datasource.username=coolstore
default.datasource.password=CSCErYcXniNYm7bT
+platform.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_config?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+platform.datasource.username=coolstore
+platform.datasource.password=CSCErYcXniNYm7bT
+
#redis
redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0
diff --git a/coolstore-partner-web/src/main/resources/application-hd.properties b/coolstore-partner-web/src/main/resources/application-hd.properties
index c06c32835..335d6cf18 100644
--- a/coolstore-partner-web/src/main/resources/application-hd.properties
+++ b/coolstore-partner-web/src/main/resources/application-hd.properties
@@ -1,9 +1,13 @@
#mysql config
-default.datasource.url=jdbc:mysql://store10-coolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+default.datasource.url=jdbc:mysql://zx-coolstore.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
default.datasource.username=coolstore
default.datasource.password=CSCErYcXniNYm7bT
+platform.datasource.url=jdbc:mysql://zx-coolstore.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_config?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+platform.datasource.username=coolstore
+platform.datasource.password=CSCErYcXniNYm7bT
+
#redis
redis.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/0
diff --git a/coolstore-partner-web/src/main/resources/application-local.properties b/coolstore-partner-web/src/main/resources/application-local.properties
index 78aa1eacb..087420e81 100644
--- a/coolstore-partner-web/src/main/resources/application-local.properties
+++ b/coolstore-partner-web/src/main/resources/application-local.properties
@@ -4,6 +4,10 @@ default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3
default.datasource.username=coolstore
default.datasource.password=CSCErYcXniNYm7bT
+platform.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_config?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+platform.datasource.username=coolstore
+platform.datasource.password=CSCErYcXniNYm7bT
+
#redis
redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege-open.redis.rds.aliyuncs.com:6379/0
@@ -133,3 +137,8 @@ special.user.id=wpayJeDAAAhGIFgUJpJN-zg39JuNbYhg_woayJeDAAA0TC8mkCJeXouw94hYA-D3
ask.bot.url=https://test.auth.wx.askbot.cn
+hqt.token.url=https://tc.cloud.hecom.cn
+hqt.token.username=18161486722
+hqt.token.grant_type=client_credentials
+hqt.token.client.id=WrPffdGpcWkcPsbN
+hqt.token.client.secret=rYe9Cwug5LwQNIBJAiW0a7weF9CAhYCD
\ No newline at end of file
diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties
index 683eb9ba6..17639edf7 100644
--- a/coolstore-partner-web/src/main/resources/application-online.properties
+++ b/coolstore-partner-web/src/main/resources/application-online.properties
@@ -3,6 +3,10 @@ default.datasource.url=jdbc:mysql://zx-coolstore.mysql.rds.aliyuncs.com:3306/coo
default.datasource.username=coolstore
default.datasource.password=CSCErYcXniNYm7bT
+platform.datasource.url=jdbc:mysql://zx-coolstore.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_config?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+platform.datasource.username=coolstore
+platform.datasource.password=CSCErYcXniNYm7bT
+
#redis
redis.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/0
diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties
index 431826011..079a324c6 100644
--- a/coolstore-partner-web/src/main/resources/application-test.properties
+++ b/coolstore-partner-web/src/main/resources/application-test.properties
@@ -4,6 +4,10 @@ default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3
default.datasource.username=coolstore
default.datasource.password=CSCErYcXniNYm7bT
+platform.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_config?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+platform.datasource.username=coolstore
+platform.datasource.password=CSCErYcXniNYm7bT
+
#redis
redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege-open.redis.rds.aliyuncs.com:6379/0