Browse Source

简易订单修改

zhanglei
hp 3 years ago
parent
commit
bf16760ba4
  1. 11
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java
  2. 11
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java
  3. 10
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java
  4. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java
  5. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml
  6. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java
  7. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java
  8. 21
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerOrgPathQuery.java
  9. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerVo.java
  10. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java
  11. 40
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml
  12. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java
  13. 33
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java
  14. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java
  15. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java
  16. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java
  17. 63
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeign.java
  18. 56
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeignFallback.java
  19. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerOrgPathQuery.java
  20. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java
  21. 67
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankRest.java
  22. 80
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankService.java

11
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java

@ -98,5 +98,16 @@ public class AppBusDepositBusDetailsVo implements Vo {
@ApiModelProperty("制单日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
}

11
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java

@ -85,4 +85,15 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
@ApiModelProperty(value = "任务id")
private String taskId;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
}

10
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java

@ -107,6 +107,16 @@ public class BusDeposit extends BaseEntity {
@ApiModelProperty("付款凭证")
private String paymentProof;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
// @ApiModelProperty(value = "节点状态")
// private String nodeState;

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java

@ -84,4 +84,13 @@ public class AppBusDepositBuscenterDto implements Dto {
@ApiModelProperty("收款银行")
private String collectionBankKey;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
}

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@ -22,7 +22,10 @@
draweeMobile AS phone,
vehicleNum AS carNumber,
staffName AS sellerName,
orgName AS departmentName
orgName AS departmentName,
collectionAccountName,
depositBank,
accountSid
FROM bus_deposit
WHERE billSid = #{virtualOrderSid}
</select>
@ -45,7 +48,10 @@
payBankAcc AS payNumber,
proBankValue AS collectionBank,
proBankKey AS collectionBankKey,
proBankAccKey AS collectionNumberKey
proBankAccKey AS collectionNumberKey,
collectionAccountName,
depositBank,
accountSid
FROM bus_deposit
WHERE billSid = #{virtualOrderSid}
AND staffSid = #{staffSid}

11
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java

@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo;
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.*;
import java.util.List;
@ -80,4 +81,14 @@ public interface FinManufacturerBankFeign {
@GetMapping("/selectAccountByUseOrgSid/{userSid}")
@ResponseBody
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(@PathVariable("userSid") String userSid);
@ApiOperation("获取该本分公司下的开户账号")
@GetMapping("/selAccountByOrgSid")
@ResponseBody
public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(@SpringQueryMap FinManufacturerOrgPathQuery query);
@ApiOperation("App获取该本分公司下的开户账号")
@PostMapping("/selAppAccountByOrgSid")
@ResponseBody
public ResultBean<PagerVo<FinManufacturerVo>> selAppAccountByOrgSid(@RequestBody PagerQuery<FinManufacturerOrgPathQuery> query);
}

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java

@ -74,4 +74,14 @@ public class FinManufacturerBankFeignFallback implements FinManufacturerBankFeig
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) {
return null;
}
@Override
public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(FinManufacturerOrgPathQuery query) {
return null;
}
@Override
public ResultBean<PagerVo<FinManufacturerVo>> selAppAccountByOrgSid(PagerQuery<FinManufacturerOrgPathQuery> query) {
return null;
}
}

21
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerOrgPathQuery.java

@ -0,0 +1,21 @@
package com.yxt.anrui.fin.api.finmanufacturerbank;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class FinManufacturerOrgPathQuery implements Query {
private static final long serialVersionUID = -2101692843030171417L;
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "机构sid")
private String orgPath;
@ApiModelProperty(value = "查询条件")
private String name;
}

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerVo.java

@ -12,8 +12,15 @@ import lombok.Data;
@Data
public class FinManufacturerVo implements Vo {
private static final long serialVersionUID = 1452730449728139855L;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("银行账号")
private String bankAccount;
@ApiModelProperty("账户名称")
private String accountName;
@ApiModelProperty("开户银行")
private String depositBank;
@ApiModelProperty("开户银行key")
private String depositBankKey;
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java

@ -26,9 +26,11 @@
package com.yxt.anrui.fin.biz.finmanufacturerbank;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankDetailsVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo;
@ -63,4 +65,8 @@ public interface FinManufacturerBankMapper extends BaseMapper<FinManufacturerBan
int selectCountByAccount1(@Param("bankAccount") String bankAccount, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid);
List<FinManufacturerVo> selectAccountByUseOrgSid(String useOrgSid);
List<FinManufacturerVo> selAccountByOrgSid(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
IPage<FinManufacturerVo> selAppAccountByOrgSid(IPage<FinManufacturerVo> page,@Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw,@Param("name") String name);
}

40
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml

@ -42,13 +42,49 @@
where bankAccount = #{bankAccount}
and useOrgSid = #{useOrgSid}
and sid
&lt;&gt;
&lt;&gt;
#{sid}
</select>
<select id="selectAccountByUseOrgSid" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerVo">
select bankAccount, accountName
select sid as accountSid, bankAccount, accountName, depositBank, depositBankKey
from fin_manufacturer_bank
where useOrgSid = #{useOrgSid}
</select>
<select id="selAccountByOrgSid" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerVo">
select sid as accountSid, bankAccount, accountName, depositBank, depositBankKey
from fin_manufacturer_bank
<where>
useOrgSid = #{useOrgSid}
<if test="name != null and name != ''">
and concat(IFNULL(bankAccount
, '')
, ifnull(accountName
, '')
, ifnull(depositBank
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
</select>
<select id="selAppAccountByOrgSid"
resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerVo">
select sid as accountSid, bankAccount, accountName, depositBank, depositBankKey
from fin_manufacturer_bank
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(bankAccount
, '')
, ifnull(accountName
, '')
, ifnull(depositBank
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
</select>
</mapper>

15
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java

@ -25,11 +25,14 @@
*********************************************************/
package com.yxt.anrui.fin.biz.finmanufacturerbank;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@ -87,4 +90,16 @@ public class FinManufacturerBankRest implements FinManufacturerBankFeign {
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) {
return finManufacturerBankService.selectAccountByUseOrgSid(userSid);
}
@Override
public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(FinManufacturerOrgPathQuery query) {
return finManufacturerBankService.selAccountByOrgSid(query);
}
@Override
public ResultBean<PagerVo<FinManufacturerVo>> selAppAccountByOrgSid(PagerQuery<FinManufacturerOrgPathQuery> query) {
ResultBean rb = ResultBean.fireFail();
IPage<FinManufacturerVo> voIPage = finManufacturerBankService.selAppAccountByOrgSid(query);
return rb.success().setData(voIPage);
}
}

33
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finmanufacturerbank;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.*;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt;
@ -167,4 +169,35 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
list.removeAll(Collections.singleton(null));
return rb.success().setData(list);
}
public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(FinManufacturerOrgPathQuery query) {
ResultBean<List<FinManufacturerVo>> rb = ResultBean.fireFail();
String userSid = query.getUserSid();
String orgPath = query.getOrgPath();
String useOrgSid = "";
if (StringUtils.isBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
} else {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
List<FinManufacturerVo> list = baseMapper.selAccountByOrgSid(useOrgSid,query.getName());
list.removeAll(Collections.singleton(null));
return rb.success().setData(list);
}
public IPage<FinManufacturerVo> selAppAccountByOrgSid(PagerQuery<FinManufacturerOrgPathQuery> query) {
QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
String name = query.getParams().getName();
IPage<FinManufacturerVo> page = PagerUtil.queryToPage(query);
String orgPath = query.getParams().getOrgPath();
String orgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
} else {
orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getParams().getUserSid()).getData();
}
qw.eq("useOrgSid", orgSid);
IPage<FinManufacturerVo> iPage = baseMapper.selAppAccountByOrgSid(page, qw, name);
return iPage;
}
}

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java

@ -89,4 +89,14 @@ public class DepositBusDetailsVo implements Vo {
@ApiModelProperty("收款银行账号")
private String collectionNumberKey;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
}

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java

@ -74,4 +74,14 @@ public class DepositBuscenterDetailVo implements Vo {
private String procInsId;
@ApiModelProperty(value = "任务id")
private String taskId;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
}

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java

@ -90,4 +90,13 @@ public class DepositBuscenterDto implements Dto {
@ApiModelProperty("制单日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
}

63
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeign.java

@ -0,0 +1,63 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.base.account;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
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.*;
/**
* Project: anrui-fin(安瑞财务) <br/>
* File: FinManufacturerBankFeign.java <br/>
* Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeign <br/>
* Description: 公司开户账号表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-03 15:00:11 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "公司开户账号表")
@FeignClient(
contextId = "anrui-terminal-FinManufacturerBank",
name = "anrui-terminal",
path = "base/v1/account",
fallback = AppFinManufacturerBankFeignFallback.class)
public interface AppFinManufacturerBankFeign {
@ApiOperation("获取该本分公司下的开户账号")
@PostMapping("/selAccountByOrgSid")
@ResponseBody
public ResultBean<PagerVo<AppManufacturerVo>> selAccountByOrgSid(@RequestBody PagerQuery<AppManufacturerOrgPathQuery> query);
}

56
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeignFallback.java

@ -0,0 +1,56 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.base.account;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-fin(安瑞财务) <br/>
* File: FinManufacturerBankFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeignFallback <br/>
* Description: 公司开户账号表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-03 15:00:11 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class AppFinManufacturerBankFeignFallback implements AppFinManufacturerBankFeign {
@Override
public ResultBean<PagerVo<AppManufacturerVo>> selAccountByOrgSid(PagerQuery<AppManufacturerOrgPathQuery> query) {
return null;
}
}

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerOrgPathQuery.java

@ -0,0 +1,19 @@
package com.yxt.anrui.terminal.api.base.account;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppManufacturerOrgPathQuery implements Query {
private static final long serialVersionUID = 5132061239127199612L;
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "机构sid")
private String orgPath;
@ApiModelProperty(value = "查询条件")
private String name;
}

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java

@ -0,0 +1,19 @@
package com.yxt.anrui.terminal.api.base.account;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppManufacturerVo implements Vo {
private static final long serialVersionUID = 6743866407572366715L;
@ApiModelProperty("银行账号")
private String bankAccount;
@ApiModelProperty("账户名称")
private String accountName;
@ApiModelProperty("开户银行")
private String depositBank;
@ApiModelProperty("开户银行key")
private String depositBankKey;
}

67
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankRest.java

@ -0,0 +1,67 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.base.account;
import com.yxt.anrui.terminal.api.base.account.AppFinManufacturerBankFeign;
import com.yxt.anrui.terminal.api.base.account.AppManufacturerOrgPathQuery;
import com.yxt.anrui.terminal.api.base.account.AppManufacturerVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* Project: anrui-fin(安瑞财务) <br/>
* File: FinManufacturerBankFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankRest <br/>
* Description: 公司开户账号表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-03 15:00:11 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "公司开户账号表")
@RestController
@RequestMapping("base/v1/account")
public class AppFinManufacturerBankRest implements AppFinManufacturerBankFeign {
@Autowired
private AppFinManufacturerBankService appFinManufacturerBankService;
@Override
public ResultBean<PagerVo<AppManufacturerVo>> selAccountByOrgSid(PagerQuery<AppManufacturerOrgPathQuery> query) {
return appFinManufacturerBankService.selAccountByOrgSid(query);
}
}

80
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankService.java

@ -0,0 +1,80 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.base.account;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageQuery;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
import com.yxt.anrui.terminal.api.base.account.AppManufacturerOrgPathQuery;
import com.yxt.anrui.terminal.api.base.account.AppManufacturerVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* Project: anrui-fin(安瑞财务) <br/>
* File: FinManufacturerBankService.java <br/>
* Class: com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService <br/>
* Description: 公司开户账号表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-03 15:00:11 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AppFinManufacturerBankService {
@Autowired
private FinManufacturerBankFeign finManufacturerBankFeign;
public ResultBean<PagerVo<AppManufacturerVo>> selAccountByOrgSid(PagerQuery<AppManufacturerOrgPathQuery> query) {
ResultBean<PagerVo<AppManufacturerVo>> rb = ResultBean.fireFail();
PagerQuery<FinManufacturerOrgPathQuery> pq = CoverUtils.getPagerQuery(query);
ResultBean<PagerVo<FinManufacturerVo>> resultBean = finManufacturerBankFeign.selAppAccountByOrgSid(pq);
List<AppManufacturerVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppManufacturerVo.class)).collect(Collectors.toList());
PagerVo<AppManufacturerVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
return rb.success().setData(v);
}
}
Loading…
Cancel
Save