fix 进件api删除多余行业，增加RsvcServer接口

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.31</version>
+    <version>1.3.32</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailRSvcController.java

@@ -4,7 +4,10 @@ import au.com.royalpay.payment.manage.appclient.core.RetailRSvcService;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.device.advise.AppClientController;
 import com.alibaba.fastjson.JSONObject;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.annotation.Resource;
 
@@ -20,9 +23,6 @@ public class RetailRSvcController {
         return retailRSvcService.findMchInfoBySourceCode(device, source_code);
     }
 
-    @PostMapping(value = "/{source_code}/enterService")
-    public JSONObject enterIntoServiceBySourceCode(@PathVariable String source_code, @RequestBody JSONObject params) {
-        return retailRSvcService.enterIntoServiceBySourceCode(source_code, params);
-    }
+
 
 }

src/main/java/au/com/royalpay/payment/manage/appclient/web/RsvcServiceController.java

@@ -0,0 +1,22 @@
+package au.com.royalpay.payment.manage.appclient.web;
+
+import au.com.royalpay.payment.manage.appclient.core.RetailRSvcService;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.annotation.Resource;
+
+@RequestMapping("/api/v1.0/server/rsvc")
+public class RsvcServiceController {
+
+    @Resource
+    private RetailRSvcService retailRSvcService;
+
+    @PostMapping(value = "/{source_code}/enterService")
+    public JSONObject enterIntoServiceBySourceCode(@PathVariable String source_code, @RequestBody JSONObject params) {
+        return retailRSvcService.enterIntoServiceBySourceCode(source_code, params);
+    }
+}

src/main/java/au/com/royalpay/payment/manage/gateway/beans/ClientPayConfig.java

@@ -18,10 +18,6 @@ public class ClientPayConfig {
     private String clientPayDesc;
     @JSONField(name = "royalpay_industry")
     private String royalpayindustry;
-    @JSONField(name = "wechat_industry")
-    private String wechatindustry;
-    @JSONField(name = "alipay_industry")
-    private String alipayindustry;
     @JSONField(name = "company_photo")
     private String companyPhoto;
     @JSONField(name = "store_photo")
@@ -56,8 +52,8 @@ public class ClientPayConfig {
 
     public JSONObject payConfig() {
         JSONObject config = (JSONObject) JSON.toJSON(this);
-        config.put("alipayindustry", alipayindustry);
-        config.put("industry", wechatindustry);
+        config.put("alipayindustry", "5311");
+        config.put("industry", "336");
         config.put("royalpayindustry", royalpayindustry);
         return config;
     }