未售买断和付款申请的销售通路修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java

@@ -4,7 +4,6 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -50,10 +49,10 @@ public interface BaseManufacturerBankFeign {
     public ResultBean<BaseManufacturerBankVo> selectDetails(@PathVariable("sid") String sid);
 
     @ApiOperation("未售买断获取厂家销售通路")
-    @GetMapping("/actualList/{useOrgSid}")
-    ResultBean<List<BaseManActualVo>> actualList(@PathVariable("useOrgSid") String useOrgSid);
+    @GetMapping("/actualList")
+    ResultBean<List<BaseManActualVo>> actualList();
 
     @ApiOperation("付款申请获取厂家销售通路")
     @GetMapping("/payList")
-    ResultBean<List<BaseManPayVo>> payList(@SpringQueryMap BaseManPayQuery query);
+    ResultBean<List<BaseManPayVo>> payList();
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java

@@ -32,12 +32,12 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe
     }
 
     @Override
-    public ResultBean<List<BaseManActualVo>> actualList(String useOrgSid) {
+    public ResultBean<List<BaseManActualVo>> actualList() {
         return null;
     }
 
     @Override
-    public ResultBean<List<BaseManPayVo>> payList(BaseManPayQuery query) {
+    public ResultBean<List<BaseManPayVo>> payList() {
         return null;
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@@ -62,9 +62,9 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
 
     List<BusApplyVo> selectByApplySid(String modelSid);
 
-    List<BaseManActualVo> actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code);
+    List<BaseManActualVo> actualList(@Param("supplierTypeValue") String supplierTypeValue, @Param("code") String code);
 
     List<BusApplyVo> selectBankByApplySid(String createOrgSid);
 
-    List<BaseManPayVo> payList(@Param("useOrgSid") String useOrgSid, @Param("code") String code);
+    List<BaseManPayVo> payList(@Param("supplierTypeValue") String supplierTypeValue, @Param("code") String code);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -72,13 +72,13 @@
     </select>
 
     <select id="actualList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo">
-        select bmb.accountName,
+        select bmb.actualPay,
                bmb.depositBank,
                bmb.bankAccount
         from base_manufacturer_bank bmb
                  left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
         where bmb.isDelete = 0
-          AND bm.useOrg = #{useOrgSid}
+          AND bm.supplierTypeValue = #{supplierTypeValue}
           and bmb.dueBankKey = #{code}
     </select>
 
@@ -91,13 +91,13 @@
     </select>
 
     <select id="payList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo">
-        select bmb.accountName,
+        select bmb.actualPay,
                bmb.depositBank,
                bmb.bankAccount
         from base_manufacturer_bank bmb
                  left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
         where bmb.isDelete = 0
-          AND bm.useOrg = #{useOrgSid}
+          AND bm.supplierTypeValue = #{supplierTypeValue}
           and bmb.dueBankKey = #{code}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java

@@ -77,16 +77,18 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign {
     }
 
     @Override
-    public ResultBean<List<BaseManActualVo>> actualList(String useOrgSid) {
+    public ResultBean<List<BaseManActualVo>> actualList() {
         ResultBean<List<BaseManActualVo>> rb = ResultBean.fireFail();
-        List<BaseManActualVo> voList = baseManufacturerBankService.actualList(useOrgSid, DictCommonEnum.dueBank.HK_TYPE.getCode());
+        String supplierTypeValue = "主机厂";
+        List<BaseManActualVo> voList = baseManufacturerBankService.actualList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode());
         return rb.success().setData(voList);
     }
 
     @Override
-    public ResultBean<List<BaseManPayVo>> payList(BaseManPayQuery query) {
+    public ResultBean<List<BaseManPayVo>> payList() {
         ResultBean<List<BaseManPayVo>> rb = ResultBean.fireFail();
-        List<BaseManPayVo> voList = baseManufacturerBankService.payList(query);
+        String supplierTypeValue = "主机厂";
+        List<BaseManPayVo> voList = baseManufacturerBankService.payList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode());
         return rb.success().setData(voList);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@@ -1,8 +1,10 @@
 package com.yxt.anrui.base.biz.basemanufacturerbank;
 
-import com.yxt.anrui.base.api.basemanufacturerbank.*;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo;
-import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
@@ -69,17 +71,15 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
         return baseMapper.selectByApplySid(modelSid);
     }
 
-    public List<BaseManActualVo> actualList(String useOrgSid, String code) {
-        return baseMapper.actualList(useOrgSid,code);
+    public List<BaseManActualVo> actualList(String supplierTypeValue, String code) {
+        return baseMapper.actualList(supplierTypeValue,code);
     }
 
     public List<BusApplyVo> selectBankByApplySid(String createOrgSid) {
         return baseMapper.selectBankByApplySid(createOrgSid);
     }
 
-    public List<BaseManPayVo> payList(BaseManPayQuery query) {
-        String useOrgSid = query.getUseOrgSid();
-        String code = DictCommonEnum.dueBank.HK_TYPE.getCode();
-        return baseMapper.payList(useOrgSid,code);
+    public List<BaseManPayVo> payList(String supplierTypeValue, String code) {
+        return baseMapper.payList(supplierTypeValue,code);
     }
 }