|
|
@@ -27,7 +27,9 @@ import me.chanjar.weixin.cp.bean.kf.WxCpKfServiceStateResp;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
|
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Slf4j
|
|
|
@@ -45,6 +47,13 @@ public class WechatCustomerServiceImpl implements WechatCustomerService {
|
|
|
|
|
|
private final SysWechatCustomerService sysWechatCustomerService;
|
|
|
|
|
|
+ private static final Map<String, String> PARTNER_VERSION_MAP = new HashMap<>();
|
|
|
+ static {
|
|
|
+ PARTNER_VERSION_MAP.put("1", "新");
|
|
|
+ PARTNER_VERSION_MAP.put("2", "旧");
|
|
|
+ PARTNER_VERSION_MAP.put("3", "");
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public String customerCallback(String msgSignature, String timestamp, String nonce, String echoStr) {
|
|
|
@@ -107,12 +116,29 @@ public class WechatCustomerServiceImpl implements WechatCustomerService {
|
|
|
}
|
|
|
if (msgListDTO.getOrigin() == 4) {
|
|
|
SysUser sysUser = sysUserService.getById(scene);
|
|
|
- CustomerSendMsgOnEventRequest customerSendMsgOnEventRequest = CustomerSendMsgOnEventRequest.sendMsgOnEvent(sysUser, msgListDTO.getMsgid(), event.getWelcomeCode());
|
|
|
+ String partnerVersion = getPartnerVersion(sysUser.getId());
|
|
|
+ CustomerSendMsgOnEventRequest customerSendMsgOnEventRequest = CustomerSendMsgOnEventRequest.sendMsgOnEvent(sysUser, msgListDTO.getMsgid(), event.getWelcomeCode(),partnerVersion);
|
|
|
wechatCustomerComponents.sendMsgOnEvent(customerSendMsgOnEventRequest);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ public String getPartnerVersion(String userId){
|
|
|
+ try {
|
|
|
+ String ver = sysUserService.getPartnerVersion(userId);
|
|
|
+ if (StringUtils.isBlank(ver)) {
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+ return PARTNER_VERSION_MAP.getOrDefault(ver, "");
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("用户[{}]获取合伙人版本异常: {}", userId, e.getMessage(), e);
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public List<CustomerListResponse.AccountListDTO> list() {
|
|
|
CustomerListRequest customerListResponse = new CustomerListRequest(0, 100);
|