|
@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ruoyi.common.core.utils.SpringUtils;
|
|
import com.ruoyi.common.core.utils.SpringUtils;
|
|
|
import com.ruoyi.common.redis.service.RedisIdGenerator;
|
|
import com.ruoyi.common.redis.service.RedisIdGenerator;
|
|
|
import com.ruoyi.common.redis.service.RedisService;
|
|
import com.ruoyi.common.redis.service.RedisService;
|
|
|
|
|
+import com.ruoyi.logistics.domain.BizWaybillOrder;
|
|
|
import com.ruoyi.logistics.domain.LogisticsOrder;
|
|
import com.ruoyi.logistics.domain.LogisticsOrder;
|
|
|
import com.ruoyi.logistics.service.LogisticsOrderService;
|
|
import com.ruoyi.logistics.service.LogisticsOrderService;
|
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
@@ -382,35 +383,4 @@ public class SysUserController extends BaseController
|
|
|
return success(deptService.selectDeptTreeList(dept));
|
|
return success(deptService.selectDeptTreeList(dept));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- private static final Logger log = LoggerFactory.getLogger(SysUserController.class);
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private RedisIdGenerator redisIdGenerator;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private LogisticsOrderService logisticsOrderService;
|
|
|
|
|
- @PostMapping("/test")
|
|
|
|
|
- public AjaxResult test(@RequestBody JSONObject json) throws UnsupportedEncodingException {
|
|
|
|
|
-
|
|
|
|
|
- LogisticsOrder logisticsOrder= new LogisticsOrder();
|
|
|
|
|
- logisticsOrder.setOrderType("SF");
|
|
|
|
|
-
|
|
|
|
|
- System.out.println(logisticsOrderService.createOrder(logisticsOrder));
|
|
|
|
|
- // String userId = redisIdGenerator.generateUniqueId("RJSD");
|
|
|
|
|
- //String userI = SpringUtils.getBean(RedisIdGenerator.class).generateUniqueId("RJSD");
|
|
|
|
|
-
|
|
|
|
|
- // System.out.println("生成订单ID: " + userId);
|
|
|
|
|
- // log.info("生成订单ID: " + userId);
|
|
|
|
|
- log.info("物流状态回调接口----状态"+json.get("orderState").toString());
|
|
|
|
|
- return AjaxResult.success(json);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- @PostMapping("/test1")
|
|
|
|
|
- public AjaxResult test( @RequestParam Map<String,Object> content)
|
|
|
|
|
- {
|
|
|
|
|
- log.info("物流收费单据回调接口----"+content.get("content"));
|
|
|
|
|
- return AjaxResult.success(content.get("content"));
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|