.drone.yml

@@ -7,16 +7,16 @@ name: release-lhb-gateway
 volumes:
   - name: mvn_repo
     host:
-      path: /home/ABServer/cache/mvn_repo
+      path: /home/ABServer/drone/cache/mvn_repo
   - name: mvn_config
     host:
-      path: /home/ABServer/config/mvn
+      path: /home/ABServer/drone/config/mvn
   - name: build-artifacts
     host:
-      path: /home/ABServer/webroot/release-lhb-gateway
+      path: /home/ABServer/drone/webroot/release-lhb-gateway
   - name: dockerfile-source
     host:
-      path: /home/ABServer/config/docker
+      path: /home/ABServer/drone/config/docker
   - name: timezone
     host:
       path: /etc/localtime
@@ -104,16 +104,16 @@ name: release-lhb-quartz
 volumes:
   - name: mvn_repo
     host:
-      path: /home/ABServer/cache/mvn_repo
+      path: /home/ABServer/drone/cache/mvn_repo
   - name: mvn_config
     host:
-      path: /home/ABServer/config/mvn
+      path: /home/ABServer/drone/config/mvn
   - name: build-artifacts
     host:
-      path: /home/ABServer/webroot/release-lhb-quartz
+      path: /home/ABServer/drone/webroot/release-lhb-quartz
   - name: dockerfile-source
     host:
-      path: /home/ABServer/config/docker
+      path: /home/ABServer/drone/config/docker
   - name: timezone
     host:
       path: /etc/localtime
@@ -202,16 +202,16 @@ name: release-lhb-system
 volumes:
   - name: mvn_repo
     host:
-      path: /home/ABServer/cache/mvn_repo
+      path: /home/ABServer/drone/cache/mvn_repo
   - name: mvn_config
     host:
-      path: /home/ABServer/config/mvn
+      path: /home/ABServer/drone/config/mvn
   - name: build-artifacts  # 构建产物临时目录
     host:
-      path: /home/ABServer/webroot/release-lhb-system
+      path: /home/ABServer/drone/webroot/release-lhb-system
   - name: dockerfile-source
     host:
-      path: /home/ABServer/config/docker
+      path: /home/ABServer/drone/config/docker
   - name: timezone
     host:
       path: /etc/localtime
@@ -302,16 +302,16 @@ name: release-lhb-basic
 volumes:
   - name: mvn_repo
     host:
-      path: /home/ABServer/cache/mvn_repo
+      path: /home/ABServer/drone/cache/mvn_repo
   - name: mvn_config
     host:
-      path: /home/ABServer/config/mvn
+      path: /home/ABServer/drone/config/mvn
   - name: build-artifacts  # 构建产物临时目录
     host:
-      path: /home/ABServer/webroot/release-lhb-basic
+      path: /home/ABServer/drone/webroot/release-lhb-basic
   - name: dockerfile-source
     host:
-      path: /home/ABServer/config/docker
+      path: /home/ABServer/drone/config/docker
   - name: timezone
     host:
       path: /etc/localtime

lhb-basic/lhb-basic-api/src/main/java/com/kxs/lhb/basic/api/dto/tongyi/OrderInfoNotify.java

@@ -32,6 +32,7 @@ public class OrderInfoNotify {
         private String payWay;
         private String phone;
         private String agentPrivateCode;
+        private String thirdPlatformCode;
     }
 
     @Data

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/controller/cusmoter/callback/CallbackController.java

@@ -21,8 +21,8 @@ public class CallbackController {
 
     @Inner(value = false)
     @RequestMapping("/lhb/notify")
-    public R notify(@RequestBody OrderInfoNotify param) {
+    public Object notify(@RequestBody OrderInfoNotify param) {
 
-        return R.ok(orderService.tongyiNotify(param));
+        return orderService.tongyiNotify(param);
     }
 }

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/service/impl/LhbOrderServiceImpl.java

@@ -429,11 +429,11 @@ public class LhbOrderServiceImpl extends MPJBaseServiceImpl<LhbOrderMapper, LhbO
             order.setAddress(param.getOrderRecvAddr().getReceiveAddress());
             order.setArea(param.getOrderRecvAddr().getReceiveProvince() + StrUtil.COMMA + param.getOrderRecvAddr().getReceiveCity() + StrUtil.COMMA + param.getOrderRecvAddr().getReceiveCountry());
             order.setContMobile(param.getOrderRecvAddr().getReceiveMobile());
-            order.setCustName(param.getOrderInfo().getUserName());
+            order.setCustName(param.getOrderRecvAddr().getReceiveName());
             order.setIfCode(ChannelCodeEnum.TY.getCode());
             order.setOutOrderSn(param.getOrderInfo().getOrderId());
             order.setMakeMobile(param.getOrderInfo().getPhone());
-            String[] split = param.getOrderInfo().getAgentPrivateCode().split("KXS");
+            String[] split = param.getOrderInfo().getThirdPlatformCode().split("KXS");
             order.setIsvNo(split[0]);
             order.setEmployNum(split[1]);
             order.setPackageName(param.getOrderDetail().getGoodsName());