Skip to content

B
bailuntec-cost
Commit 9cc6e795 by huluobin
Options

update

parent 21ad59e2
Showing with 114 additions and 146 deletions
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/cost/CostController.java
package com.blt.other.module.cost.controller.cost;
import com.bailuntec.common.JsonUtilByFsJson;
import com.bailuntec.cost.api.dto.CostDto;
import com.bailuntec.cost.api.dto.CostListPrintDto;
import com.bailuntec.cost.api.response.CostResult;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.blt.other.common.util.AxiosUtil;
import com.blt.other.common.util.MyMapperUtil;
import com.blt.other.common.util.PathUtil;
......@@ -33,6 +35,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.Enumeration;
import java.util.List;
import java.util.stream.Collectors;
......@@ -329,6 +332,86 @@ public class CostController {
return CostResult.success();
}
@GetMapping(value = {"check/cashierCallbackPass/{costNo}"})
public CostResult<Void> cashierCallbackPass(@PathVariable String costNo) {
CashierCallbackUrlVo cashierCallbackUrlVo = new CashierCallbackUrlVo();
cashierCallbackUrlVo.setId(costNo);
CashierCallbackUrlDataVo cashierCallbackUrlDataVo = new CashierCallbackUrlDataVo();
cashierCallbackUrlDataVo.setMessage("通过");
cashierCallbackUrlDataVo.setSuccess(true);
CashierCallbackUrlDataDataVo cashierCallbackUrlDataDataVo = new CashierCallbackUrlDataDataVo();
cashierCallbackUrlDataDataVo.setPayid(Integer.parseInt(IdWorker.getIdStr().substring(8)));
cashierCallbackUrlDataDataVo.setPayno(IdWorker.getIdStr());
cashierCallbackUrlDataDataVo.setPayamount(BigDecimal.ZERO);
cashierCallbackUrlDataDataVo.setPayuserid(3108);
cashierCallbackUrlDataDataVo.setPayusername("陈泽凯");
cashierCallbackUrlDataDataVo.setPaynote("");
Paydetail paydetail = new Paydetail();
paydetail.setCashierbankaccountid(252);
paydetail.setCashierbankcardname("");
paydetail.setCashierbankcard("");
paydetail.setCashierbankcardname("");
paydetail.setCashierunitcode("CNY");
paydetail.setCashierunitname("人民币");
paydetail.setCashierrate(BigDecimal.ONE);
paydetail.setCashierpaymoney(new BigDecimal("100"));
paydetail.setCashierpaymoneyrmb(new BigDecimal("100"));
paydetail.setCashierservicemoneyrmb(new BigDecimal("100"));
paydetail.setOtherordercode("");
paydetail.setCashierannex("");
paydetail.setCashierbankcardtype(0);
paydetail.setCashiermothercard("");
cashierCallbackUrlDataDataVo.setPaydetail(paydetail);
cashierCallbackUrlDataVo.setData("\"" + JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataDataVo) + "\"");
cashierCallbackUrlVo.setData(cashierCallbackUrlDataVo);
this.cashierCallbackUrl(cashierCallbackUrlVo);
return CostResult.success();
}
@GetMapping(value = {"check/cashierCallbackReject/{costNo}"})
public CostResult<Void> cashierCallbackReject(@PathVariable String costNo) {
CashierCallbackUrlVo cashierCallbackUrlVo = new CashierCallbackUrlVo();
cashierCallbackUrlVo.setId(costNo);
CashierCallbackUrlDataVo cashierCallbackUrlDataVo = new CashierCallbackUrlDataVo();
cashierCallbackUrlDataVo.setMessage("被驳回");
cashierCallbackUrlDataVo.setSuccess(true);
CashierCallbackUrlDataDataVo cashierCallbackUrlDataDataVo = new CashierCallbackUrlDataDataVo();
cashierCallbackUrlDataDataVo.setPayid(Integer.parseInt(IdWorker.getIdStr().substring(8)));
cashierCallbackUrlDataDataVo.setPayno(IdWorker.getIdStr());
cashierCallbackUrlDataDataVo.setPayamount(BigDecimal.ZERO);
cashierCallbackUrlDataDataVo.setPayuserid(3108);
cashierCallbackUrlDataDataVo.setPayusername("陈泽凯");
cashierCallbackUrlDataDataVo.setPaynote("");
Paydetail paydetail = new Paydetail();
paydetail.setCashierbankaccountid(252);
paydetail.setCashierbankcardname("");
paydetail.setCashierbankcard("");
paydetail.setCashierbankcardname("");
paydetail.setCashierunitcode("CNY");
paydetail.setCashierunitname("人民币");
paydetail.setCashierrate(BigDecimal.ONE);
paydetail.setCashierpaymoney(new BigDecimal("100"));
paydetail.setCashierpaymoneyrmb(new BigDecimal("100"));
paydetail.setCashierservicemoneyrmb(new BigDecimal("100"));
paydetail.setOtherordercode("");
paydetail.setCashierannex("");
paydetail.setCashierbankcardtype(0);
paydetail.setCashiermothercard("");
cashierCallbackUrlDataDataVo.setPaydetail(paydetail);
cashierCallbackUrlDataVo.setData("\"" + JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataDataVo) + "\"");
cashierCallbackUrlVo.setData(cashierCallbackUrlDataVo);
this.cashierCallbackUrl(cashierCallbackUrlVo);
return CostResult.success();
}
@ApiOperation("修改发票")
@PostMapping(value = "/check/lend/invoice")
public CostApiDto.UpdateCostResp invoice(@RequestParam String costNo,
......
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java
......@@ -195,13 +195,9 @@ public abstract class AbstractCostService implements CostService {
CostDomain costDomain = new CostDomain();
costDomain.setCostNo(costNo);
costDomain.setAmount(amount);
String kindSuffix = "";
if (costDetailDomains.size() > 1) {
kindSuffix = " 等共" + costDetailDomains.size() + "项";
}
costDomain.setKindNo(costDetailDomains.get(0).getKindNo() + kindSuffix);
costDomain.setKindName(costDetailDomains.get(0).getKindName() + kindSuffix);
costDomain.setKindNo(costDetailDomains.get(0).getKindNo());
costDomain.setKindName(costDetailDomains.get(0).getKindName());
costDao.update(costDomain, new LambdaQueryWrapper<CostDomain>()
.eq(CostDomain::getCostNo, costDomain.getCostNo()));
}
......@@ -290,9 +286,18 @@ public abstract class AbstractCostService implements CostService {
costCashiercallbackDomain.setCostNo(costNo);
costCashiercallbackDomain.setMessage(costCashiercallbackDomain.getMessage().toUpperCase());
costCashiercallbackDomain.setPayno(costCashiercallbackDomain.getPayno().toUpperCase());
CostDomain costDomain = costDao.selectByCostNo(costNo);
//
if (!costDomain.getCostStatus().equals(CostDomain.STATUS_UN_PAY)) {
throw new BizRuntimeException("invalid status");
}
//驳回
if (costCashiercallbackDomain.getMessage().contains("被驳回")) {
this.cashierCallbackReject(costCashiercallbackDomain);
} else {
}
//通过
else {
this.cashierCallbackPass(costCashiercallbackDomain);
}
}
......
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costplan/CostPlanNewPayServiceImpl.java
......@@ -107,12 +107,9 @@ public class CostPlanNewPayServiceImpl extends AbstractCostPlanService implement
costDomain.setTypeName(costDetailDomains.get(0).getTypeName());
CostTypeDomain costTypeDomain = costTypeDao.selectByTypeNo(typeNo);
costDomain.setSubjectCode(costTypeDomain.getSubjectCode());
String kindSuffix = "";
if (costDetailDomains.size() > 1) {
kindSuffix = " 等共" + costDetailDomains.size() + "项";
}
costDomain.setKindNo(costDetailDomains.get(0).getKindNo() + kindSuffix);
costDomain.setKindName(costDetailDomains.get(0).getKindName() + kindSuffix);
costDomain.setKindNo(costDetailDomains.get(0).getKindNo());
costDomain.setKindName(costDetailDomains.get(0).getKindName());
if (null == costDomain.getAmount()) {
costDomain.setAmount(new BigDecimal(0));
}
......
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/vo/Paydetail.java
package com.blt.other.module.cost.vo;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class Paydetail {
private Integer cashierbankaccountid;
private String cashierbankname;
private String cashierbankcard;
private String cashierbankcardname;
private String cashierunitcode;
private String cashierunitname;
private BigDecimal cashierrate;
private BigDecimal cashierpaymoney;
private BigDecimal cashierpaymoneyrmb;
private BigDecimal cashierservicemoneyrmb;
private String otherordercode;
private String cashierannex;
private Integer cashierbankcardtype;
private String cashiermothercard;
public Integer getCashierbankaccountid() {
return cashierbankaccountid;
}
private BigDecimal cashierpaymoneyrmb;
public void setCashierbankaccountid(Integer cashierbankaccountid) {
this.cashierbankaccountid = cashierbankaccountid;
}
private BigDecimal cashierservicemoneyrmb;
public String getCashierbankname() {
return cashierbankname;
}
private String otherordercode;
public void setCashierbankname(String cashierbankname) {
this.cashierbankname = cashierbankname;
}
private String cashierannex;
public String getCashierbankcard() {
return cashierbankcard;
}
private Integer cashierbankcardtype;
public void setCashierbankcard(String cashierbankcard) {
this.cashierbankcard = cashierbankcard;
}
public String getCashierbankcardname() {
return cashierbankcardname;
}
public void setCashierbankcardname(String cashierbankcardname) {
this.cashierbankcardname = cashierbankcardname;
}
public String getCashierunitcode() {
return cashierunitcode;
}
public void setCashierunitcode(String cashierunitcode) {
this.cashierunitcode = cashierunitcode;
}
public String getCashierunitname() {
return cashierunitname;
}
public void setCashierunitname(String cashierunitname) {
this.cashierunitname = cashierunitname;
}
public BigDecimal getCashierrate() {
return cashierrate;
}
public void setCashierrate(BigDecimal cashierrate) {
this.cashierrate = cashierrate;
}
public BigDecimal getCashierpaymoney() {
return cashierpaymoney;
}
public void setCashierpaymoney(BigDecimal cashierpaymoney) {
this.cashierpaymoney = cashierpaymoney;
}
public BigDecimal getCashierpaymoneyrmb() {
return cashierpaymoneyrmb;
}
public void setCashierpaymoneyrmb(BigDecimal cashierpaymoneyrmb) {
this.cashierpaymoneyrmb = cashierpaymoneyrmb;
}
public BigDecimal getCashierservicemoneyrmb() {
return cashierservicemoneyrmb;
}
public void setCashierservicemoneyrmb(BigDecimal cashierservicemoneyrmb) {
this.cashierservicemoneyrmb = cashierservicemoneyrmb;
}
public String getOtherordercode() {
return otherordercode;
}
public void setOtherordercode(String otherordercode) {
this.otherordercode = otherordercode;
}
public String getCashierannex() {
return cashierannex;
}
public void setCashierannex(String cashierannex) {
this.cashierannex = cashierannex;
}
public Integer getCashierbankcardtype() {
return cashierbankcardtype;
}
public void setCashierbankcardtype(Integer cashierbankcardtype) {
this.cashierbankcardtype = cashierbankcardtype;
}
public String getCashiermothercard() {
return cashiermothercard;
}
public void setCashiermothercard(String cashiermothercard) {
this.cashiermothercard = cashiermothercard;
}
@Override
public String toString() {
return "Paydetail{" +
"cashierbankaccountid=" + cashierbankaccountid +
", cashierbankname='" + cashierbankname + '\'' +
", cashierbankcard='" + cashierbankcard + '\'' +
", cashierbankcardname='" + cashierbankcardname + '\'' +
", cashierunitcode='" + cashierunitcode + '\'' +
", cashierunitname='" + cashierunitname + '\'' +
", cashierrate=" + cashierrate +
", cashierpaymoney=" + cashierpaymoney +
", cashierpaymoneyrmb=" + cashierpaymoneyrmb +
", cashierservicemoneyrmb=" + cashierservicemoneyrmb +
", otherordercode='" + otherordercode + '\'' +
", cashierannex='" + cashierannex + '\'' +
", cashierbankcardtype=" + cashierbankcardtype +
", cashiermothercard='" + cashiermothercard + '\'' +
'}';
}
private String cashiermothercard;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment