iSnail/CTPlatform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2

Browse Source
This commit is contained in:
isnail
2025-05-28 23:25:48 +08:00
parent 9a18ef2691
commit 6cd3268908
38 changed files with 1245 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/pom.xml
View File

@@ -23,6 +23,10 @@
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ct</artifactId>

14
api/src/main/java/com/ruoyi/api/EncryptDemo.java
View File

@@ -10,9 +10,9 @@ public class EncryptDemo {
public static void main(String[] args) {
// SM2的公钥
// String publicKey = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEZRdaHuSCG8U87+Cmh9LKbgC+DRBEwWpAyN31aCzoE1flWonnZezX2GqbvDdz7a0AxE6+FGEH1lxPYW39XhYupw==";
String publicKey = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEZRdaHuSCG8U87+Cmh9LKbgC+DRBEwWpAyN31aCzoE1flWonnZezX2GqbvDdz7a0AxE6+FGEH1lxPYW39XhYupw==";
String publicKey = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEXGNABR3GP+JwMDuCoGkb2XlLAFaxW+BH/lsFwYd0MdycIgygZuQXW1bKoGIKDWRy0NfLl3LoHMdhgq3QC9lqPg==";
// SM2的私钥
String privateKey = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQg006Jj+5NK9HrtnyXNpnb131jV/8CHeo5t2T74WliktCgCgYIKoEcz1UBgi2hRANCAARPJZBDpVhCRt5bkQuYUWv9T8MAkahw0R3eG6cWbgShEdkPUxlzKqUJH+n/ogKbBlZhMArd3P3o1pvGLrIY5KQJ";
String privateKey = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgvH2W6ns3iHYntIwC8gj07yuMygk42R/dWvJrxSuSKqqgCgYIKoEcz1UBgi2hRANCAAQjIDLY5pi08KQxPpGtRML4+cuoRcKrUlhZEDnAI3j3PxwEwJdSIul3Vmtm2Tz0gVWsp1F39rqq6yxuhqV+upyN";
// String privateKey = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQghUZb+m/+ficnlbtoVJhkbUsw9FKQ5yF1wYcOP+tRQK+gCgYIKoEcz1UBgi2hRANCAASsJ3XVa/Udszyl0/tudSM7tUJsK190+2UQmEEZ6qLbRguzN+vaI3dsc04KllUojTRgXvE3vfaNAHOwQ6H5cjH+";
// 初始化SM2
SM2 sm2 = SmUtil.sm2(privateKey, publicKey);
@@ -21,9 +21,9 @@ public class EncryptDemo {
// String encryptStr3 = sm2.encryptBase64("13371893748", KeyType.PublicKey);
// System.out.println(sm2.encryptBase64("e34c1951-c492-4ed5-8e02-1e44eee3df7b", KeyType.PublicKey));
// System.out.println(encryptStr);
String a = "69bd19ff-8fff-400e-9aba-25e36f1f5438";
String a = "1ec03852-c1b1-447c-a266-0e6e94875f1d";
String b = "{\n" +
" \"saleId\": \"108002\",\n" +
" \"saleId\": \"107656\",\n" +
" \"name\": \"毕彦兵\",\n" +
" \"idCard\": \"230104198809293718\",\n" +
" \"contactMobile\": \"18980692055\",\n" +
@@ -31,13 +31,13 @@ public class EncryptDemo {
// " \"city\": \"哈尔滨市\",\n" +
// " \"county\": \"松北区\",\n" +
// " \"installedAddress\": \"世茂大道\",\n" +
" \"number\": \"15317740623\"\n" +
" \"number\": \"19384158412\"\n" +
"}";
String c = "{\"serialNumber\": \"437f78390b4c4a57b91cb804da0fe424\"}";
System.out.println(sm2.encryptBase64(c, KeyType.PublicKey));
System.out.println(sm2.encryptBase64(a, KeyType.PublicKey));
// System.out.println(encryptStr3);
// 使用SM2解密字符串
// String data = sm2.decryptStr("BI7jtmBaoB+O0E/5qbBZd35h5M/BGhLcCB0kOM5ONebPJNC7+mS404aeYpqQEmW5caqLYX9y6eV87tOKwWC3bs+ns83SHA8k1yMMTZrHKooPAH28ylgrgv/jZZbw7Xtsfxm3+XjWUQDmacHrYujwlhCiAHRxAEIot/3fvSkVB49gHjaDj7ER0NQCKUwVt5xLXgJlCHyYsWmY+ZWj6LmzBzIdND1IFQIEx3iKDuXAgZ05ojQb+y27YlI1TLKn36eTOlhifdnOG89UN1UWkMZuZ8m5qnaMyR7bT+7LazIyBvgAGMkgGpCNwVBXT4t5y+/nRvHwYkURGGO7DLgybL5/KtZ74yemZ52tqgU8pm4HWNWncdZ7veeu55gwUe8ttt3C8UtTwtSYlrRpfoWTSwE8rBtvl//MZWkNXqePCnO1QIQYhKiX5GopqjlxFLlr0CirW0/fhA==", KeyType.PrivateKey);
// String data = sm2.decryptStr("BJVOZMKm8hlussB8GeZHia6wF0AvzP4SdOEbdfrNgAa\\/LVAudJD+rGmS1Zn7kD1l6gbw4XsySGpi+uOl\\/+JNpgwIjL+t9IXK0ogTICPDIJIvgf\\/79YxKzXj01pMCeosGac0Jqi5r8J\\/r0pxUNLZvnx4iS+M73j3D08o8OkrTB3LTDxyZPA==\"},\"verify\":false,\"body\":\"BLvEwASr7\\/cuu9v+oNurtm5kHbnkhu1AzQtOfNhC49j49Ai\\/mHa+uKslUXWHFdiXQuaEs8ZVxSUscew6z5nBcujtZ8R5KkFK9UAxWEkqtmmKIyOxwPLFAuw\\/QdR7mzxMctdwt7yP5rma9zgVVXrL1nKn2+ACKjLqvxtj0tCKZrx2\\/zUcMd8JaUvIksNRIxbtMLr9NLXCDuiR+B\\/sCYFp1iOxrxS34ZfPQR4ayYj0kWQtx4FAgD87\\/2f5Crf6Dbrgmxcwjf2hWN+QXub16puR0OMHnqc8XKkEzER8255u3EGoIfFLZTQzUQv1HRJox\\/tIvXDh\\/uMgLQGjEEMrvBO8k\\/mu+De8ZNfX7FQp\\/x\\/Vck\\/mxOs=", KeyType.PrivateKey);
// String data = sm2.decryptStr("BLmSzK7I1FAzi+bePR5HhCL0WruEYftUA4bw1cU0TBM0xfX4MX6ImLJzVBJP5jATbOsDC136xuDBf8uFZxmXf2gnIEOX+qBfZD7LcPgdcv06TpnCVtEQEcGULMe/iB3SEHj2xAx3R3bbkgXKGrJ2paj2D4S0uwbs0mLYpIQLFXsXogNupeUHEIq8aLNyUEDRH9HMFG+sJMJpGW80CaywaCCoevpwjc2pAdMdejT5+4/mQjXhKE5kBMyuRA0ugHR6ZfMd9P+pEk6UFDzlWw8kJ11xWgPZcNKWNA3JJBt035jdyMLNfIrPSeHjVXoQZR/l0CXcu+CsFuYvRH3zVaZBqFy+mmeB8omsdnGiuVYcJQfhAnrdU2p4bZEYAwN7KdaZCOPwE/xHoEyAsxKn/WExsYNfyaCs7wzrVaRJmOGBxL4AxzH9W4M6K6SILdPWeaz/DnPZG+pkSIck9jUwcYQnXR9y2EO95l1kwnbYrhFvL5EdLvHZgnrpWP2P7NCqixCKWYP/2rOoXpfhC0e+6w26lKAOUNbqlMWmvEcNBSUqLLzlmogmhB+Dk3SaJX6cwsFzJR9qW/4jE52V+E2pcD4ZIiqNu6UkFWZvMwQqxUvn/evyoKpPQZNr16HKTmyqG/BODPSDPOACmLDD/B8cLidb9MQaYbfS9eEXkTR7GMWji4YGBU8sMBP7WA==", KeyType.PrivateKey);
// System.out.println(data);

57
api/src/main/java/com/ruoyi/api/controller/APIController.java
View File

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.domain.CTResponse;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.ct.CTNetException;
import com.ruoyi.ct.domain.AgentOrder;
import com.ruoyi.ct.domain.bo.AgentAccountGoodBo;
import com.ruoyi.ct.domain.bo.AgentOrderBo;
@@ -123,7 +124,7 @@ public class APIController extends BaseController {
}
try {
List<JSONObject> data = ctService.selectNumber(agentAccountVo.getPersonnelId(), agentAccountGoodVo.getSaleId(), String.valueOf(page), String.valueOf(pageSize));
List<JSONObject> data = ctService.selectNumber(agentAccountGoodVo.getPersonnelId(), agentAccountGoodVo.getSaleId(), String.valueOf(page), String.valueOf(pageSize));
saveLog(request, agentAccountVo.getPersonnelId(), 1, "", data.toString());
return R.ok(data);
} catch (Exception e) {
@@ -157,8 +158,7 @@ public class APIController extends BaseController {
agentOrderBo.setAgentId(agentAccountVo.getAgentId());
agentOrderBo.setStoreId("13");
agentOrderBo.setSerialNumber(UUID.randomUUID().toString().replace("-", ""));
agentOrderBo.setStatus("0");
agentOrderBo.setPersonnelId(agentAccountVo.getPersonnelId());
agentOrderBo.setCreateTime(new Date());
AgentAccountGoodVo agentAccountGoodVo;
SM2 sm2 = (SM2) request.getAttribute("sm2");
@@ -189,6 +189,7 @@ public class APIController extends BaseController {
saveLog(request, agentAccountVo.getPersonnelId(), 0, "saleId格式错误", null);
return R.fail(ERROR_CODE_PARAMS, "参数错误");
}
agentOrderBo.setPersonnelId(agentAccountGoodVo.getPersonnelId());
// 校验用户信息，姓名、身份证、手机号
if (ObjectUtils.isNull(agentOrderBo.getName())) {
@@ -273,31 +274,62 @@ public class APIController extends BaseController {
}
// 保存数据
// agentOrderService.insertByBo(agentOrderBo);
agentOrderBo.setStatus("0");
agentOrderService.insertByBo(agentOrderBo);
CTResponse<String> response = null;
String sn = UUID.randomUUID().toString();
log.error(sn+" ------------------下单开始-------------------");
try {
CTResponse<String> response = ctService.saveOrder(agentOrderBo.getName(), agentOrderBo.getIdCard(), agentOrderBo.getContactMobile(),
response = ctService.saveOrder(agentOrderBo.getName(), agentOrderBo.getIdCard(), agentOrderBo.getContactMobile(),
agentOrderBo.getInstalledAddress(), agentOrderBo.getSaleId(), agentOrderBo.getStoreId(),
agentOrderBo.getPersonnelId(), agentOrderBo.getProvince(), agentOrderBo.getCity(),
agentOrderBo.getCounty(), agentOrderBo.getSerialNumber(), agentOrderBo.getNumber(),
agentOrderBo.getLogiRemark(), agentOrderBo.getPageUrl(), agentOrderBo.getRemark(),
agentOrderBo.getInstallAddress(), "", "");
agentOrderBo.getInstallAddress(), "", "", sn);
if (response.isSuccess()) {
agentOrderBo.setOrderNum(response.getData());
agentOrderBo.setOrderStatus("S1000");
agentOrderBo.setStatus("0");
agentOrderService.insertByBo(agentOrderBo);
// agentOrderService.insertByBo(agentOrderBo);
agentOrderService.updateByBo(agentOrderBo);
log.error(sn+" ------------------下单成功------------------- ");
return R.ok("操作成功", agentOrderBo.getSerialNumber());
} else {
// 订单验证失败
log.error("电信订单验证失败");
log.error(sn+" ------------------下单失败-------------------");
log.error(sn+" 电信订单验证失败");
log.error(sn+" 订单号："+agentOrderBo.getSerialNumber());
log.error(sn+response.getMessage());
log.error(sn+" ------------------下单结束------------------- ");
agentOrderBo.setStatus("-1");
agentOrderService.updateByBo(agentOrderBo);
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信订单验证失败", response.getMessage());
return R.fail(ERROR_CODE_PARAMS, response.getMessage());
}
} catch (Exception e) {
} catch (CTNetException e) {
// 504
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信请求异常", "");
e.printStackTrace();
log.error(e.getMessage());
return R.fail(ERROR_CODE_NETWORK, "电信网络异常");
log.error(sn+" ------------------下单异常-------------------");
log.error(sn+" 电信订单验网络异常");
log.error(sn+" 订单号："+agentOrderBo.getSerialNumber());
log.error(sn+" ------------------下单结束------------------- ");
agentOrderBo.setStatus("-2");
agentOrderBo.setHasError(1);
agentOrderService.updateByBo(agentOrderBo);
return R.fail(ERROR_CODE_NETWORK, "内部业务网络异常", agentOrderBo.getSerialNumber());
} catch (Exception e) {
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信请求异常", "");
e.printStackTrace();
log.error(sn+" ------------------下单异常-------------------");
log.error(sn+" 电信订单验网络异常");
log.error(sn+" 订单号："+agentOrderBo.getSerialNumber());
log.error(sn+" ------------------下单结束------------------- ");
agentOrderBo.setStatus("-2");
agentOrderBo.setHasError(1);
agentOrderService.updateByBo(agentOrderBo);
return R.fail(ERROR_CODE_NETWORK, "内部业务网络异常", agentOrderBo.getSerialNumber());
}
}
@@ -329,7 +361,8 @@ public class APIController extends BaseController {
}
LambdaQueryWrapper<AgentOrder> lqw = new LambdaQueryWrapper<>();
lqw.eq(AgentOrder::getPersonnelId, agentAccountVo.getPersonnelId());
// lqw.eq(AgentOrder::getPersonnelId, agentAccountVo.getPersonnelId());
lqw.eq(AgentOrder::getAgentAccountId, agentAccountVo.getId());
lqw.eq(ObjectUtils.isNotNull(saleId), AgentOrder::getSaleId, saleId);
if (ObjectUtils.isNotNull(name)) {
try {
@@ -417,7 +450,7 @@ public class APIController extends BaseController {
AgentOrderBo bo = new AgentOrderBo();
bo.setSerialNumber(serialNumber);
bo.setAgentId(agentAccountVo.getAgentId());
bo.setPersonnelId(agentAccountVo.getPersonnelId());
// bo.setPersonnelId(agentAccountVo.getPersonnelId());
List<AgentOrderVo> voList = agentOrderService.queryList(bo);
if (voList.size() > 0) {
AgentOrderVo vo = voList.get(0);

68
api/src/main/java/com/ruoyi/api/controller/APIControllerV2.java
View File

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.domain.CTResponse;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.ct.CTNetException;
import com.ruoyi.ct.domain.AgentOrder;
import com.ruoyi.ct.domain.bo.AgentAccountGoodBo;
import com.ruoyi.ct.domain.bo.AgentOrderBo;
@@ -124,7 +125,7 @@ public class APIControllerV2 extends BaseController {
}
try {
List<JSONObject> data = ctService.selectNumber(agentAccountVo.getPersonnelId(), agentAccountGoodVo.getSaleId(), String.valueOf(page), String.valueOf(pageSize));
List<JSONObject> data = ctService.selectNumber(agentAccountGoodVo.getPersonnelId(), agentAccountGoodVo.getSaleId(), String.valueOf(page), String.valueOf(pageSize));
saveLog(request, agentAccountVo.getPersonnelId(), 1, "", data.toString());
return R.ok(data);
} catch (Exception e) {
@@ -302,7 +303,7 @@ public class APIControllerV2 extends BaseController {
agentOrderBo.setStoreId("13");
agentOrderBo.setSerialNumber(UUID.randomUUID().toString().replace("-", ""));
agentOrderBo.setStatus("2");
agentOrderBo.setPersonnelId(agentAccountVo.getPersonnelId());
agentOrderBo.setCreateTime(new Date());
AgentAccountGoodVo agentAccountGoodVo;
SM2 sm2 = (SM2) request.getAttribute("sm2");
@@ -334,6 +335,8 @@ public class APIControllerV2 extends BaseController {
return R.fail(ERROR_CODE_PARAMS, "参数错误");
}
agentOrderBo.setPersonnelId(agentAccountGoodVo.getPersonnelId());
// 校验用户信息，姓名、身份证、手机号
if (ObjectUtils.isNull(agentOrderBo.getName())) {
log.error("姓名为空");
@@ -445,7 +448,13 @@ public class APIControllerV2 extends BaseController {
JSONObject requestBody = JSONUtil.parseObj(body);
System.out.println("requestBody = " + requestBody);
log.error("上传图片");
log.error("上传图片类型："+requestBody.getStr("type"));
log.error("上传图片订单号："+requestBody.getStr("serialNumber"));
log.error("上传图片size："+requestBody.getStr("img").length());
AgentOrderVo agentOrderVo = agentOrderService.queryBySerialNumber(requestBody.getStr("serialNumber"));
log.error("上传图片用户："+agentOrderVo.getName());
log.error("上传图片商品："+agentOrderVo.getTitle());
if (ObjectUtils.isNull(agentOrderVo)) {
log.error("订单不存在");
saveLog(request, agentAccountVo.getPersonnelId(), 0, "订单不存在", null);
@@ -469,10 +478,10 @@ public class APIControllerV2 extends BaseController {
agentOrderBo.setFrontFace(1);
}
agentOrderService.updateByBo(agentOrderBo);
return R.ok(agentOrderVo.getSerialNumber());
return R.ok("操作成功", agentOrderVo.getSerialNumber());
} else {
// 订单验证失败
log.error("上传失败");
log.error("上传成功，验证失败");
saveLog(request, agentAccountVo.getPersonnelId(), 0, "上传失败", response.getMessage());
return R.fail(ERROR_CODE_PARAMS, response.getMessage());
}
@@ -481,14 +490,14 @@ public class APIControllerV2 extends BaseController {
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信请求异常", "");
e.printStackTrace();
log.error(e.getMessage());
return R.fail(ERROR_CODE_NETWORK, "电信网络异常");
return R.fail(ERROR_CODE_NETWORK, "内部业务网络异常");
}
}
@PostMapping("confirmOrder")
public R<String> confirmOrder(HttpServletRequest request, @RequestBody String body) {
public R<JSONObject> confirmOrder(HttpServletRequest request, @RequestBody String body) {
if (!checkAccount(request)) {
return R.fail(ERROR_CODE_LOGIN, request.getAttribute("msg").toString());
}
@@ -515,14 +524,17 @@ public class APIControllerV2 extends BaseController {
saveLog(request, agentAccountVo.getPersonnelId(), 0, "照片上传不完整", null);
return R.fail(ERROR_CODE_ENCRYPT, "照片上传不完整");
}
CTResponse<String> response = null;
String sn = UUID.randomUUID().toString();
log.error(sn+" ------------------下单开始-------------------");
try {
CTResponse<String> response = ctService.saveOrder(agentOrderVo.getName(), agentOrderVo.getIdCard(), agentOrderVo.getContactMobile(),
response = ctService.saveOrder(agentOrderVo.getName(), agentOrderVo.getIdCard(), agentOrderVo.getContactMobile(),
agentOrderVo.getInstalledAddress(), agentOrderVo.getSaleId(), agentOrderVo.getStoreId(),
agentOrderVo.getPersonnelId(), agentOrderVo.getProvince(), agentOrderVo.getCity(),
agentOrderVo.getCounty(), agentOrderVo.getSerialNumber(), agentOrderVo.getNumber(),
agentOrderVo.getLogiRemark(), agentOrderVo.getPageUrl(), agentOrderVo.getRemark(),
agentOrderVo.getInstallAddress(), "", "idCardFront,idCardBack,frontFace",
"2");
"2", sn);
if (response.isSuccess()) {
AgentOrderBo agentOrderBo = new AgentOrderBo();
agentOrderBo.setId(agentOrderVo.getId());
@@ -530,18 +542,52 @@ public class APIControllerV2 extends BaseController {
agentOrderBo.setOrderStatus("S1000");
agentOrderBo.setStatus("0");
agentOrderService.updateByBo(agentOrderBo);
return R.ok("操作成功", agentOrderBo.getSerialNumber());
JSONObject result = new JSONObject();
result.set("serialNumber", agentOrderBo.getSerialNumber());
result.set("ctOrderNum", agentOrderBo.getOrderNum());
log.error(sn+" ------------------下单成功------------------- ");
return R.ok("操作成功", result);
} else {
// 订单验证失败
log.error("电信订单验证失败");
log.error(sn+" ------------------下单失败-------------------");
log.error(sn+" 电信订单验证失败");
log.error(sn+" 订单号："+agentOrderVo.getSerialNumber());
log.error(sn+response.getMessage());
log.error(sn+" ------------------下单结束------------------- ");
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信订单验证失败", response.getMessage());
return R.fail(ERROR_CODE_PARAMS, response.getMessage());
}
} catch (CTNetException e) {
// 504
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信请求异常", "");
e.printStackTrace();
log.error(e.getMessage());
AgentOrderBo agentOrderBo = new AgentOrderBo();
agentOrderBo.setId(agentOrderVo.getId());
log.error(e.getMessage());
log.error(sn+" ------------------下单异常-------------------");
log.error(sn+" 电信订单验网络异常");
log.error(sn+" 订单号："+agentOrderVo.getSerialNumber());
log.error(sn+" ------------------下单结束------------------- ");
agentOrderBo.setStatus("-2");
agentOrderBo.setHasError(1);
agentOrderService.updateByBo(agentOrderBo);
return R.fail(ERROR_CODE_NETWORK, "内部业务网络异常", agentOrderVo.getSerialNumber());
} catch (Exception e) {
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信请求异常", "");
e.printStackTrace();
log.error(e.getMessage());
return R.fail(ERROR_CODE_NETWORK, "电信网络异常");
AgentOrderBo agentOrderBo = new AgentOrderBo();
agentOrderBo.setId(agentOrderVo.getId());
log.error(e.getMessage());
log.error(sn+" ------------------下单异常-------------------");
log.error(sn+" 电信订单验网络异常");
log.error(sn+" 订单号："+agentOrderVo.getSerialNumber());
log.error(sn+" ------------------下单结束------------------- ");
agentOrderBo.setStatus("-2");
agentOrderBo.setHasError(1);
agentOrderService.updateByBo(agentOrderBo);
return R.fail(ERROR_CODE_NETWORK, "内部业务网络异常");
}
}

53
api/src/main/java/com/ruoyi/api/controller/APIFreeController.java
View File

@@ -140,7 +140,7 @@ public class APIFreeController extends BaseController {
AgentAccountVo agentAccountVo = agentAccountService.queryById(agentAccountGoodVo.getAgentAccountId());
try {
List<JSONObject> data = ctService.selectNumber(agentAccountVo.getPersonnelId(), agentAccountGoodVo.getSaleId(), String.valueOf(page), String.valueOf(pageSize));
List<JSONObject> data = ctService.selectNumber(agentAccountGoodVo.getPersonnelId(), agentAccountGoodVo.getSaleId(), String.valueOf(page), String.valueOf(pageSize));
saveLog(request, agentAccountVo.getPersonnelId(), 1, "", data.toString());
return R.ok(data);
} catch (Exception e) {
@@ -174,7 +174,7 @@ public class APIFreeController extends BaseController {
agentOrderBo.setStoreId("13");
agentOrderBo.setSerialNumber(UUID.randomUUID().toString().replace("-", ""));
agentOrderBo.setStatus("0");
agentOrderBo.setPersonnelId(agentAccountVo.getPersonnelId());
agentOrderBo.setCreateTime(new Date());
agentOrderBo.setOrderType(1);
{
@@ -227,6 +227,8 @@ public class APIFreeController extends BaseController {
agentOrderBo.setInstallAddress(agentOrderBo.getInstalledAddress());
}
agentOrderBo.setPersonnelId(agentAccountGoodVo.getPersonnelId());
// 校验数量
if (agentAccountGoodVo.getIsNeedVerify() == 1) {
Integer registerCount = agentAccountGoodVo.getRegisterCount();
@@ -261,23 +263,54 @@ public class APIFreeController extends BaseController {
agentAccountGoodService.updateByBo(agentAccountGoodBo);
}
}
if (ObjectUtils.isNotNull(agentAccountVo.getVerifyUrl())) {
try {
JSONObject paramMap = new JSONObject();
paramMap.set("name", agentOrderBo.getName());
paramMap.set("idCard", agentOrderBo.getIdCard());
paramMap.set("contactMobile", agentOrderBo.getContactMobile());
String verifyResult = HttpUtil.post(agentAccountVo.getVerifyUrl(), paramMap.toString());
JSONObject verifyData = JSONUtil.parseObj(verifyResult);
if (verifyData.getInt("code") != 200) {
log.error("验证不通过");
saveLog(request, agentAccountVo.getPersonnelId(), 0, "验证不通过", null);
return R.fail(ERROR_CODE_VERIFY, "验证错误");
}
} catch (Exception e) {
e.printStackTrace();
log.error("验证请求错误");
saveLog(request, agentAccountVo.getPersonnelId(), 0, "验证请求错误", null);
return R.fail(ERROR_CODE_VERIFY, "验证错误");
}
}
// 保存数据
agentOrderService.insertByBo(agentOrderBo);
String sn = UUID.randomUUID().toString();
log.error(sn+" ------------------下单开始-------------------");
try {
CTResponse<String> response = ctService.saveOrder(agentOrderBo.getName(), agentOrderBo.getIdCard(), agentOrderBo.getContactMobile(),
agentOrderBo.getInstalledAddress(), agentOrderBo.getSaleId(), agentOrderBo.getStoreId(),
agentOrderBo.getPersonnelId(), agentOrderBo.getProvince(), agentOrderBo.getCity(),
agentOrderBo.getCounty(), agentOrderBo.getSerialNumber(), agentOrderBo.getNumber(),
agentOrderBo.getLogiRemark(), agentOrderBo.getPageUrl(), agentOrderBo.getRemark(),
agentOrderBo.getInstallAddress(), "", "");
agentOrderBo.getInstallAddress(), "", "", sn);
if (response.isSuccess()) {
agentOrderBo.setOrderNum(response.getData());
agentOrderBo.setOrderStatus("S1000");
agentOrderBo.setStatus("0");
agentOrderService.insertByBo(agentOrderBo);
agentOrderService.updateByBo(agentOrderBo);
log.error(sn+" ------------------下单成功------------------- ");
return R.ok("操作成功", agentOrderBo.getSerialNumber());
} else {
// 订单验证失败
log.error("电信订单验证失败");
log.error(sn+" ------------------下单失败-------------------");
log.error(sn+" 电信订单验证失败");
log.error(sn+" 订单号："+agentOrderBo.getSerialNumber());
log.error(sn+response.getMessage());
log.error(sn+" ------------------下单结束------------------- ");
agentOrderBo.setStatus("-1");
agentOrderService.updateByBo(agentOrderBo);
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信订单验证失败", response.getMessage());
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信订单验证失败", response.getMessage());
return R.fail(ERROR_CODE_PARAMS, response.getMessage());
}
@@ -285,11 +318,19 @@ public class APIFreeController extends BaseController {
saveLog(request, agentAccountVo.getPersonnelId(), 0, "电信请求异常", "");
e.printStackTrace();
log.error(e.getMessage());
return R.fail(ERROR_CODE_NETWORK, "电信网络异常");
log.error(sn+" ------------------下单异常-------------------");
log.error(sn+" 电信订单验网络异常");
log.error(sn+" 订单号："+agentOrderBo.getSerialNumber());
log.error(sn+" ------------------下单结束------------------- ");
agentOrderBo.setStatus("-2");
agentOrderBo.setHasError(1);
agentOrderService.updateByBo(agentOrderBo);
return R.fail(ERROR_CODE_NETWORK, "内部业务网络异常");
}
}
}
@GetMapping("/getUserList")
public R<TableDataInfo<AgentAccountGoodUserVo>> getUserList(HttpServletRequest request,
@RequestParam String code,

37
api/src/main/java/com/ruoyi/api/controller/APITestController.java
View File

@@ -7,12 +7,15 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.ct.domain.AgentOrder;
import com.ruoyi.ct.domain.bo.AgentAccountGoodBo;
import com.ruoyi.ct.domain.bo.AgentOrderBo;
import com.ruoyi.ct.domain.vo.AgentAccountGoodVo;
import com.ruoyi.ct.domain.vo.AgentAccountVo;
import com.ruoyi.ct.service.CTService;
import com.ruoyi.ct.service.IAgentAccountGoodService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +35,9 @@ public class APITestController extends BaseTestController {
@Resource
private CTService ctService;
@Resource
private IAgentAccountGoodService agentAccountGoodService;
@GetMapping("getGoodsList")
public R<JSONObject> getGoodsList(HttpServletRequest request, Integer page, Integer pageSize) {
if (!checkAccount(request)) {
@@ -43,13 +49,26 @@ public class APITestController extends BaseTestController {
if (pageSize == null || pageSize < 1 || pageSize > 50) {
pageSize = 20;
}
AgentAccountVo agentAccountVo = (AgentAccountVo) request.getAttribute("agentAccount");
AgentAccountGoodBo agentAccountGoodBo = new AgentAccountGoodBo();
agentAccountGoodBo.setAgentAccountId(agentAccountVo.getId());
Page<AgentAccountGoodVo> result = agentAccountGoodService.queryPage(agentAccountGoodBo, page, pageSize);
JSONObject resultData = new JSONObject();
JSONObject meta = new JSONObject();
meta.set("total", 2);
meta.set("total", result.getTotal());
meta.set("page", page);
meta.set("pageSize", pageSize);
resultData.set("meta", meta);
resultData.set("objects", JSONUtil.parseArray("[{\"saleId\":\"108002\",\"title\":\"49套餐\",\"content\":\"大概的介绍\"},{\"saleId\":\"107657\",\"title\":\"59套餐\"}]"));
List<JSONObject> dataList = new ArrayList<>();
for(AgentAccountGoodVo vo: result.getRecords()) {
JSONObject data = new JSONObject();
data.set("saleId", vo.getSaleId());
data.set("title", vo.getTitle());
data.set("content", vo.getContent());
dataList.add(data);
}
resultData.set("objects", dataList);
return R.ok(resultData);
}
@@ -65,12 +84,20 @@ public class APITestController extends BaseTestController {
pageSize = 20;
}
AgentAccountVo agentAccountVo = (AgentAccountVo) request.getAttribute("agentAccount");
if (ObjectUtils.isNull(saleId) || !SALE_ID.equals(saleId)) {
if (ObjectUtils.isNull(saleId)) {
log.error("参数错误");
return R.fail(ERROR_CODE_PARAMS, "参数错误");
}
AgentAccountGoodVo agentAccountGoodVo = agentAccountGoodService.getByGoodAndAccount(saleId, agentAccountVo.getId());
if (ObjectUtils.isNull(agentAccountGoodVo)) {
log.error("参数错误");
log.error("agentAccountVo: "+agentAccountVo);
log.error("saleId: "+saleId);
return R.fail(ERROR_CODE_PARAMS, "参数错误");
}
try {
List<JSONObject> data = ctService.selectNumber(agentAccountVo.getPersonnelId(), SALE_ID,
List<JSONObject> data = ctService.selectNumber(agentAccountGoodVo.getPersonnelId(), SALE_ID,
String.valueOf(page), String.valueOf(pageSize));
return R.ok(data);
} catch (Exception e) {
@@ -117,7 +144,7 @@ public class APITestController extends BaseTestController {
}
try {
if (ObjectUtils.isNull(saleId) || !SALE_ID.equals(saleId)) {
if (ObjectUtils.isNull(saleId)) {
log.error("saleId无效");
System.out.println("saleId无效");
return R.fail(ERROR_CODE_PARAMS, "参数错误");

47
api/src/main/java/com/ruoyi/api/controller/APITestControllerV2.java
View File

@@ -14,7 +14,8 @@ import com.ruoyi.ct.domain.bo.AgentOrderBo;
import com.ruoyi.ct.domain.vo.AgentAccountGoodVo;
import com.ruoyi.ct.domain.vo.AgentAccountVo;
import com.ruoyi.ct.domain.vo.AgentOrderVo;
import com.ruoyi.ct.service.CTService;
import com.ruoyi.ct.domain.vo.GoodVo;
import com.ruoyi.ct.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -31,6 +32,17 @@ import java.util.UUID;
public class APITestControllerV2 extends BaseTestController {
@Resource
private CTService ctService;
@Resource
private IAgentAccountGoodService agentAccountGoodService;
@Resource
private IAgentService agentService;
@Resource
private IAgentOrderService agentOrderService;
@Resource
private IGoodService goodService;
@GetMapping("getGoodsList")
public R<JSONObject> getGoodsList(HttpServletRequest request, Integer page, Integer pageSize) {
@@ -103,7 +115,7 @@ public class APITestControllerV2 extends BaseTestController {
agentOrderBo.setStoreId("13");
agentOrderBo.setSerialNumber(UUID.randomUUID().toString().replace("-", ""));
agentOrderBo.setStatus("0");
agentOrderBo.setPersonnelId(agentAccountVo.getPersonnelId());
agentOrderBo.setCreateTime(new Date());
AgentAccountGoodVo agentAccountGoodVo;
{
@@ -113,21 +125,28 @@ public class APITestControllerV2 extends BaseTestController {
if (ObjectUtils.isNull(saleId)) {
log.error("saleId为空");
System.out.println("saleId为空");
return R.fail(ERROR_CODE_PARAMS, "参数错误");
return R.fail(ERROR_CODE_PARAMS, "saleId为空");
}
try {
if (ObjectUtils.isNull(saleId) || !SALE_ID.equals(saleId)) {
try {
agentAccountGoodVo = agentAccountGoodService.getByGoodAndAccount(saleId, agentAccountVo.getId());
agentOrderBo.setAgentAccountId(agentAccountGoodVo.getId());
agentOrderBo.setSaleId(agentAccountGoodVo.getSaleId());
GoodVo goodVo = goodService.queryById(agentAccountGoodVo.getGoodId());
agentOrderBo.setTitle(goodVo.getName());
agentOrderBo.setContent(goodVo.getContent());
if (ObjectUtils.isNull(agentAccountGoodVo)) {
log.error("saleId无效");
System.out.println("saleId无效");
return R.fail(ERROR_CODE_PARAMS, "参数错误");
return R.fail(ERROR_CODE_PARAMS, "saleId无效2");
}
} catch (Exception e) {
log.error("saleId格式错误");
System.out.println("saleId格式错误");
return R.fail(ERROR_CODE_PARAMS, "参数错误");
return R.fail(ERROR_CODE_PARAMS, "saleId格式错误2");
}
agentOrderBo.setPersonnelId(agentAccountGoodVo.getPersonnelId());
// 校验用户信息，姓名、身份证、手机号
if (ObjectUtils.isNull(agentOrderBo.getName())) {
log.error("姓名为空");
@@ -182,13 +201,13 @@ public class APITestControllerV2 extends BaseTestController {
JSONObject requestBody = JSONUtil.parseObj(body);
System.out.println("requestBody = " + requestBody);
return R.ok(requestBody.getStr("serialNumber"));
return R.ok("操作成功", requestBody.getStr("serialNumber"));
}
@PostMapping("confirmOrder")
public R<String> confirmOrder(HttpServletRequest request, @RequestBody String body) {
public R<JSONObject> confirmOrder(HttpServletRequest request, @RequestBody String body) {
if (!checkAccount(request)) {
return R.fail(ERROR_CODE_LOGIN, request.getAttribute("msg").toString());
}
@@ -203,8 +222,10 @@ public class APITestControllerV2 extends BaseTestController {
JSONObject requestBody = JSONUtil.parseObj(body);
System.out.println("requestBody = " + requestBody);
return R.ok(requestBody.getStr("serialNumber"));
JSONObject result = new JSONObject();
result.set("serialNumber", requestBody.getStr("serialNumber"));
result.set("ctOrderNum", "HZ123456");
return R.ok("操作成功", result);
}
@GetMapping("getOrderList")

2
api/src/main/resources/application-dev.yml
View File

@@ -18,7 +18,7 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://43.140.198.163:3380/ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
url: jdbc:mysql://154.8.141.58:3380/ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: root
password: qaHljgd123.
# 从库数据源