|
|
@@ -1,5 +1,6 @@
|
|
|
package com.ruixuan.isc.controller;
|
|
|
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -10,7 +11,6 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.google.gson.Gson;
|
|
|
import com.kuaidi100.sdk.api.Subscribe;
|
|
|
import com.kuaidi100.sdk.contant.ApiInfoConstant;
|
|
|
-import com.kuaidi100.sdk.contant.CompanyConstant;
|
|
|
import com.kuaidi100.sdk.core.IBaseClient;
|
|
|
import com.kuaidi100.sdk.request.SubscribeParam;
|
|
|
import com.kuaidi100.sdk.request.SubscribeParameters;
|
|
|
@@ -25,6 +25,7 @@ import com.ruixuan.common.enums.BusinessType;
|
|
|
import com.ruixuan.common.utils.Check;
|
|
|
import com.ruixuan.isc.entity.KuaishouItemCollectSampleExpress;
|
|
|
import com.ruixuan.isc.entity.KuaishouItemCollectSamples;
|
|
|
+import com.ruixuan.isc.entity.KuaishouItemCollectSampleLog;
|
|
|
import com.ruixuan.isc.enums.CompanyEnum;
|
|
|
import com.ruixuan.isc.service.IKuaishouItemCollectSamplesService;
|
|
|
import com.ruixuan.system.service.ISysDeptService;
|
|
|
@@ -71,23 +72,23 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
TableDataInfo tableDataInfo = new TableDataInfo();
|
|
|
try {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
- if (Check.isNull(userId)) {
|
|
|
- throw new Exception("请传入登录人ID");
|
|
|
- }
|
|
|
- String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
- if (roleId.equals("courtshipManager") || roleId.equals("bdManager") || roleId.equals("associationManager")) { // 经理层级查看部门下所有数据
|
|
|
- Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
|
- List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
|
|
|
- if (roleId.equals("bdManager") || roleId.equals("associationManager")) {
|
|
|
- requestMap.put("collectSampleIds", userIds);
|
|
|
- } else {
|
|
|
- requestMap.put("itemCreateIds", userIds);
|
|
|
+ if (!Check.isNull(userId)) {
|
|
|
+ String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
+ if (roleId.equals("courtshipManager") || roleId.equals("bdManager") || roleId.equals("associationManager")) { // 经理层级查看部门下所有数据
|
|
|
+ Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
|
+ List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
|
|
|
+ if (roleId.equals("bdManager") || roleId.equals("associationManager")) {
|
|
|
+ requestMap.put("collectSampleIds", userIds);
|
|
|
+ } else {
|
|
|
+ requestMap.put("itemCreateIds", userIds);
|
|
|
+ }
|
|
|
+ } else if (roleId.equals("association") || roleId.equals("bd")) { // 社群和bd查看申请人为自己的领样信息
|
|
|
+ requestMap.put("collectSampleId", userId);
|
|
|
+ } else if (roleId.equals("courtship")) { // 招商查看创建人为自己的领样信息
|
|
|
+ requestMap.put("itemCreateId", userId);
|
|
|
}
|
|
|
- } else if (roleId.equals("association") || roleId.equals("bd")) { // 社群和bd查看申请人为自己的领样信息
|
|
|
- requestMap.put("collectSampleId", userId);
|
|
|
- } else if (roleId.equals("courtship")) { // 招商查看创建人为自己的领样信息
|
|
|
- requestMap.put("itemCreateId", userId);
|
|
|
}
|
|
|
+
|
|
|
if (!Check.isNull(itemId)) {
|
|
|
requestMap.put("itemId", itemId);
|
|
|
}
|
|
|
@@ -191,8 +192,13 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
if (Check.isNull(id)) {
|
|
|
throw new Exception("id不能为空");
|
|
|
}
|
|
|
+ KuaishouItemCollectSampleLog sampleLog = new KuaishouItemCollectSampleLog();
|
|
|
+ sampleLog.setUserId(kuaishouItemCollectSamples.getUserId());
|
|
|
+ sampleLog.setUserName(kuaishouItemCollectSamples.getUserName());
|
|
|
+ sampleLog.setSampleId(id);
|
|
|
Integer collectSampleStatus = kuaishouItemCollectSamples.getCollectSampleStatus();
|
|
|
if (!Check.isNull(collectSampleStatus)) {
|
|
|
+ sampleLog.setCollectSampleStatus(collectSampleStatus);
|
|
|
if (collectSampleStatus == 2) {
|
|
|
String collectSampleDesc = kuaishouItemCollectSamples.getCollectSampleDesc();
|
|
|
if (Check.isNull(collectSampleDesc)) {
|
|
|
@@ -207,6 +213,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
if (Check.isNull(collectSampleDesc)) {
|
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("招商审核作业拒绝,请重新提交");
|
|
|
}
|
|
|
+ kuaishouItemCollectSamplesService.cleanLogs(kuaishouItemCollectSamples.getId(), 6);
|
|
|
}
|
|
|
if (collectSampleStatus == 7) { // 作业完成
|
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("作业已完成");
|
|
|
@@ -214,17 +221,24 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
}
|
|
|
String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
|
|
|
if (!Check.isNull(courierNumber)) {
|
|
|
+ sampleLog.setCollectSampleStatus(4);
|
|
|
kuaishouItemCollectSamples.setCollectSampleStatus(4);
|
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
|
|
|
// 调用快递接口
|
|
|
kuaishouItemCollectSamplesService.subscribe(id, courierNumber, kuaishouItemCollectSamples.getCompanyCode());
|
|
|
}
|
|
|
String taskFileUrl = kuaishouItemCollectSamples.getTaskFileUrl();
|
|
|
- if (Check.isNull(taskFileUrl)) { // 作业上传成功
|
|
|
+ if (!Check.isNull(taskFileUrl)) { // 作业上传成功
|
|
|
+ sampleLog.setCollectSampleStatus(6);
|
|
|
kuaishouItemCollectSamples.setCollectSampleStatus(6);
|
|
|
kuaishouItemCollectSamples.setCollectSampleDesc("作业上传成功,待招商审核");
|
|
|
}
|
|
|
- kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
|
|
|
+ int i = kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
|
|
|
+ if (i > 0) {
|
|
|
+ sampleLog.setCreateTime(new Date());
|
|
|
+ sampleLog.setUpdateTime(new Date());
|
|
|
+ kuaishouItemCollectSamplesService.insertLog(sampleLog);
|
|
|
+ }
|
|
|
returnJson.put("code", 0);
|
|
|
returnJson.put("message", "修改成功");
|
|
|
} catch (Exception e) {
|
|
|
@@ -255,8 +269,26 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @GetMapping("/courierNumberInfo")
|
|
|
+ public JSONObject courierNumberInfo(String courierNumber) {
|
|
|
+ JSONObject returnJson = new JSONObject();
|
|
|
+ try {
|
|
|
+ if (Check.isNull(courierNumber)) {
|
|
|
+ throw new Exception("快递单号不能为空");
|
|
|
+ }
|
|
|
+ returnJson = kuaishouItemCollectSamplesService.courierNumberInfo(courierNumber);
|
|
|
+ returnJson.put("code", 0);
|
|
|
+ returnJson.put("message", "查询成功");
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ returnJson.put("code", -1);
|
|
|
+ returnJson.put("message", e.getMessage());
|
|
|
+ }
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+
|
|
|
@PutMapping("/testSubscribe")
|
|
|
- public JSONObject testSubscribe(String phone, String courierNumber,String code) {
|
|
|
+ public JSONObject testSubscribe(String phone, String courierNumber, String code) {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
try {
|
|
|
SubscribeParameters subscribeParameters = new SubscribeParameters();
|
|
|
@@ -301,11 +333,14 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
String nu = lastResult.getString("nu");
|
|
|
String com = lastResult.getString("com");
|
|
|
if ("3".equals(state)) {
|
|
|
- KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
|
|
|
- updateSample.setCourierNumber(nu);
|
|
|
- updateSample.setCollectSampleStatus(5);
|
|
|
- updateSample.setCollectSampleDesc("快递已签收,待上传作业");
|
|
|
- kuaishouItemCollectSamplesService.updateByNum(updateSample);
|
|
|
+ Integer status = kuaishouItemCollectSamplesService.getStatusByCourierNumbe(nu);
|
|
|
+ if (status < 5) { // 防止快递重复回调
|
|
|
+ KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
|
|
|
+ updateSample.setCourierNumber(nu);
|
|
|
+ updateSample.setCollectSampleStatus(5);
|
|
|
+ updateSample.setCollectSampleDesc("快递已签收,待上传作业");
|
|
|
+ kuaishouItemCollectSamplesService.updateByNum(updateSample);
|
|
|
+ }
|
|
|
}
|
|
|
JSONArray data = lastResult.getJSONArray("data");
|
|
|
KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();
|