提交

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/jd/JdApiController.java

@@ -26,7 +26,8 @@ import java.net.URLEncoder;
 @RequestMapping("/open/jd")
 public class JdApiController {
 
-    private static String DOMAIN = "http://127.0.0.1:80";
+    private static final String DOMAIN = "http://127.0.0.1:80";
+
     @Autowired
     private JdApiService jdApiService;
 
@@ -39,28 +40,22 @@ public class JdApiController {
         String msg = "";
         if (StrUtil.isBlank(code) || StrUtil.isBlank(state)) {
             msg = "参数错误";
-//            response.sendError(HttpStatus.HTTP_BAD_REQUEST, "参数错误");
-//            return;
         }
+
         //获取token并且入库
         try {
             jdApiService.getAccessTokenByCode(code);
         } catch (Exception e) {
             log.error("京东获取token异常", e);
             msg = "京东获取token异常";
-//            response.sendError(HttpStatus.HTTP_INTERNAL_ERROR, e.getMessage());
-//            return;
         }
         response.sendRedirect(DOMAIN + "/callback.html?msg=" + URLEncoder.encode(msg));
     }
 
-
     @RequestMapping("/build2LoginUrl")
     @ResponseBody
     public String build2LoginUrl() {
-        String url = jdApiService.build2LoginUrl();
-//        String url = DOMAIN + "/testLogin.html?"+ IdUtil.getSnowflakeNextIdStr();
-        return url;
+        return jdApiService.build2LoginUrl();
     }
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/JdApiService.java

@@ -14,38 +14,26 @@ public interface JdApiService {
 
     /**
      * 构造jd登录地址
-     *
-     * @author hj
      */
     String build2LoginUrl();
 
     /**
      * 订单回告
-     *
-     * @author hj
      */
-    void tellBackOrer(TellBackOrderVO tellBackOrderVO);
+    void tellBackOrder(TellBackOrderVO tellBackOrderVO);
 
     /**
      * 开始京东订单采集
-     *
-     * @author hj
-     * @date 2023/12/13 22:30
      */
     void startJdOrder(JdInfoVo jdInfoVo);
 
     /**
      * 开始京东退货单采集
-     *
-     * @author hj
-     * @date 2023/12/13 22:30
      */
     void startJdBackOrder(JdInfoVo jdInfoVo);
 
     /**
      * 刷新京东状态
-     *
-     * @param
      */
     void refreshJdState(JdInfoVo jdInfoVo);
 
@@ -54,7 +42,9 @@ public interface JdApiService {
      */
     void initTenantDict();
 
+    /**
+     * 补偿商品id为空
+     */
     void compensatingProductNon();
 
-
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdApiServiceImpl.java

@@ -207,7 +207,7 @@ public class JdApiServiceImpl implements JdApiService {
     }
 
     @Override
-    public void tellBackOrer(TellBackOrderVO tellBackOrderVO) {
+    public void tellBackOrder(TellBackOrderVO tellBackOrderVO) {
         VcConfirmpurchaseorderResponse response;
         try {
             VcConfirmpurchaseorderRequest request = buildConfirmpurchaseorderRequest(tellBackOrderVO);
@@ -325,7 +325,7 @@ public class JdApiServiceImpl implements JdApiService {
         handleDeliveryCenter();
         handleComponent();
         handleReturnStates();
-        System.out.println("字典初始化完成");
+        log.info("字典初始化完成");
     }
 
     /**
@@ -349,7 +349,7 @@ public class JdApiServiceImpl implements JdApiService {
             }
         });
         SecurityUtils.clearTenantId();
-        System.out.println("补偿商品id完成");
+        log.info("补偿商品id完成");
     }
 
     /**

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -801,7 +801,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         tellBackOrderVO.setBackInfo(backInfos);
         //只在生产环境调用回告代码防止测试环境误点
         if ("prod".equals(SpringUtil.getActiveProfile())) {
-            jdApiService.tellBackOrer(tellBackOrderVO);
+            jdApiService.tellBackOrder(tellBackOrderVO);
         }
         //修改订单状态
         lambdaUpdate()