新增顺丰同城的业务代码，回调地址确定

.gitignore

@@ -1,74 +0,0 @@
-# 编译后的class文件,忽略所有以[.class]结尾的文件
-*.class
-
-# 日志文件,忽略所有以[.log]结尾的文件.
-*.log
-
-# BlueJ 文件,忽略所有以[.ctxt]结尾的文件.
-*.ctxt
-
-# Mobile Tools for Java (J2ME),忽略[.mtj.tmp/]目录及其子文件.
-.mtj.tmp/
-
-# 打包文件,忽略所有以[.jar]或[.war]或[.nar]或[.ear]或[.zip]或[.tar.gz]或[rar]结尾的文件.
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# 虚拟机崩溃日志,忽略所有以[hs_err_pid]开头的文件
-hs_err_pid*
-
-#maven忽略文件
-HELP.md
-target/
-/target/
-**/target/**
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**
-!**/src/test/**
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-.log
-
-#IntelliJ IDEA 忽略文件
-.idea
-*.iws
-*.iml
-*.ipr
-.mvn
-mvnw*
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-
-### VS Code ###
-.vscode/
-
-### generated files ###
-bin/
-gen/
-
-### MAC ###
-.DS_Store
-
-### Other ###
-logs/
-log
-temp/
-classes/

mall-gateway/src/main/resources/application.yml

@@ -80,6 +80,9 @@ secure:
       - "/admin/shop/shop-purchase-invoice/impPurchaseInvoiceTemp"
       - "/admin/shop/shop-product-base/impProductTemp"
       - "/admin/pay/payController/wxRefundNotify"
+      - "/shop/sf-express/cancel-order/notify"
+      - "/shop/sf-express/rider-order-status/notify"
+      - "/shop/sf-express/order-complete/notify"
       - "/admin/shop/open/**"
       - "/admin/account/open/**"
       - "/esProduct/**"

mall-gateway/target/classes/application.yml

@@ -80,6 +80,9 @@ secure:
       - "/admin/shop/shop-purchase-invoice/impPurchaseInvoiceTemp"
       - "/admin/shop/shop-product-base/impProductTemp"
       - "/admin/pay/payController/wxRefundNotify"
+      - "/shop/sf-express/cancel-order/notify"
+      - "/shop/sf-express/rider-order-status/notify"
+      - "/shop/sf-express/order-complete/notify"
       - "/admin/shop/open/**"
       - "/admin/account/open/**"
       - "/esProduct/**"

mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/controller/api/SFExpressApiController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "顺丰同城Api端")
 @RestController
-@RequestMapping("/api/shop/sf-express")
+@RequestMapping("/shop/sf-express")
 public class SFExpressApiController {
 
     @Autowired

mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/controller/mobile/SFExpressController.java

@@ -70,7 +70,7 @@ public class SFExpressController {
 
     @ApiOperation(value = "获取配送员轨迹H5", notes = "获取配送员轨迹H5")
     @RequestMapping(value = "/rider-viewv2", method = RequestMethod.POST)
-    public SFExpressApiRes riderviewv2(@RequestParam(name = "order_id", defaultValue = "JS4151806257378") String orderId) {
+    public SFExpressApiRes riderViewV2(@RequestParam(name = "order_id", defaultValue = "JS4151806257378") String orderId) {
         Map<String, Object> params = new HashMap<>();
         params.put("order_id",orderId);
         return sfExpressApiService.riderViewV2(params);

mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java

@@ -317,7 +317,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
             return new SFExpressApiRes().fail(2002, "请求签名sign校验失败！");
         }
 
-        logger.info("接收顺丰原因订单取消回调返回的 JSON 数据：{}", jsonData);
+        logger.info("接收顺丰配送状态更改回调返回的 JSON 数据：{}", jsonData);
 
         return new SFExpressApiRes().success("success");
     }
@@ -339,7 +339,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
             return new SFExpressApiRes().fail(2002, "请求签名sign校验失败！");
         }
 
-        logger.info("接收顺丰原因订单取消回调返回的 JSON 数据：{}", jsonData);
+        logger.info("接收顺丰订单完成回调返回的 JSON 数据：{}", jsonData);
 
         return new SFExpressApiRes().success("success");
     }