|
@@ -1,5 +1,6 @@
|
|
package com.hys.app.service.kuaidiniao;
|
|
package com.hys.app.service.kuaidiniao;
|
|
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.codec.Base64;
|
|
import cn.hutool.core.codec.Base64;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
@@ -34,6 +35,7 @@ import java.net.URLEncoder;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
+import java.util.regex.Pattern;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
|
|
public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
|
|
@@ -116,14 +118,21 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void createStore(CreateStoreModel createStoreModel, String constants) {
|
|
public void createStore(CreateStoreModel createStoreModel, String constants) {
|
|
|
|
+ if (Pattern.matches(".*[\\u4e00-\\u9fa5\\p{P}].*", createStoreModel.getStoreCode())){
|
|
|
|
+ throw new ServiceException("门店编码和统一社会信用代码不能包含中文和特殊符号");
|
|
|
|
+ }
|
|
|
|
+ if (Pattern.matches(".*[\\u4e00-\\u9fa5\\p{P}].*", createStoreModel.getCreditCode())){
|
|
|
|
+ throw new ServiceException("门店编码和统一社会信用代码不能包含中文和特殊符号");
|
|
|
|
+ }
|
|
Long modelId = createStoreModel.getId();
|
|
Long modelId = createStoreModel.getId();
|
|
createStoreModel.setId(null);
|
|
createStoreModel.setId(null);
|
|
fillParam(createStoreModel);
|
|
fillParam(createStoreModel);
|
|
|
|
+ CreateStoreModel createStoreModel2 = BeanUtil.copyProperties(createStoreModel, CreateStoreModel.class);
|
|
try {
|
|
try {
|
|
- String design = URLEncoder.encode(Base64.encode(DigestUtil.md5Hex(JSONUtil.toJsonStr(createStoreModel) + apiKey)), "UTF-8");
|
|
|
|
|
|
+ String design = URLEncoder.encode(Base64.encode(DigestUtil.md5Hex(JSONUtil.toJsonStr(createStoreModel2) + apiKey)), "UTF-8");
|
|
System.out.println("创建店铺签名--------------------------------------" + design);
|
|
System.out.println("创建店铺签名--------------------------------------" + design);
|
|
//拼接参数
|
|
//拼接参数
|
|
- String param = "interfaceType=" + constants + "&customerCode=" + id + "&requestData=" + JSONUtil.toJsonStr(createStoreModel) + "&dataSign=" + design;
|
|
|
|
|
|
+ String param = "interfaceType=" + constants + "&customerCode=" + id + "&requestData=" + JSONUtil.toJsonStr(createStoreModel2) + "&dataSign=" + design;
|
|
//发请求
|
|
//发请求
|
|
String res = HttpUtil.post(url, param);
|
|
String res = HttpUtil.post(url, param);
|
|
Map map = JSON.parseObject(res, Map.class);
|
|
Map map = JSON.parseObject(res, Map.class);
|