From a698210ca8814673887121cb3a51ca324e4e037b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 20 八月 2025 17:17:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java | 195 +++++++++++++++++++++---------------------------
1 files changed, 86 insertions(+), 109 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java
index e8650b5..5f3a4f9 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java
@@ -2,35 +2,30 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.cloudPayment.example.MchApplicationExample;
import com.stylefeng.guns.modular.system.controller.util.Base64Util;
import com.stylefeng.guns.modular.system.model.TBank;
import com.stylefeng.guns.modular.system.model.TBankNext;
+import com.stylefeng.guns.modular.system.model.TEnterpriseWithdrawal;
import com.stylefeng.guns.modular.system.model.TImgMid;
import com.stylefeng.guns.modular.system.service.ITBankNextService;
import com.stylefeng.guns.modular.system.service.ITBankService;
+import com.stylefeng.guns.modular.system.service.ITEnterpriseWithdrawalService;
import com.stylefeng.guns.modular.system.service.ITImgMidService;
-import com.unionpay.upyzt.exception.UpyztException;
-import com.unionpay.upyzt.resp.MchApplicationResp;
-import com.unionpay.upyzt.resp.MchApplicationStoreResp;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-import com.stylefeng.guns.modular.system.model.TEnterpriseWithdrawal;
-import com.stylefeng.guns.modular.system.service.ITEnterpriseWithdrawalService;
+import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.Base64;
import java.util.List;
/**
@@ -54,56 +49,50 @@
@Autowired
private ITBankNextService bankNextService;
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到首页
*/
@RequestMapping("")
- public String index(Model model) throws UpyztException {
- TEnterpriseWithdrawal companyId = tEnterpriseWithdrawalService.selectOne(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", ShiroKit.getUser().getObjectId()));
- if(companyId!=null){
+ public String index(Model model) {
+ TEnterpriseWithdrawal companyId = tEnterpriseWithdrawalService.selectOne(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
+ if (companyId != null) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- model.addAttribute("item",companyId);
- model.addAttribute("time1",companyId.getBusinessExpireTime().split(",")[0]);
- model.addAttribute("time11",companyId.getBusinessExpireTime().split(",")[1]);
- model.addAttribute("time2",companyId.getUnifiedSocialCreditCodeExpireTime().split(",")[0]);
- model.addAttribute("time22",companyId.getUnifiedSocialCreditCodeExpireTime().split(",")[1]);
- model.addAttribute("time3",companyId.getCertificateExpireTime().split(",")[0]);
- model.addAttribute("time33",companyId.getCertificateExpireTime().split(",")[1]);
+ model.addAttribute("item", companyId);
+ model.addAttribute("time1", companyId.getBusinessExpireTime().split(",")[0]);
+ model.addAttribute("time11", companyId.getBusinessExpireTime().split(",")[1]);
+ model.addAttribute("time2", companyId.getUnifiedSocialCreditCodeExpireTime().split(",")[0]);
+ model.addAttribute("time22", companyId.getUnifiedSocialCreditCodeExpireTime().split(",")[1]);
+ model.addAttribute("time3", companyId.getCertificateExpireTime().split(",")[0]);
+ model.addAttribute("time33", companyId.getCertificateExpireTime().split(",")[1]);
String depositBank = companyId.getDepositBank();
TBankNext tBankNext = bankNextService.selectById(depositBank);
TBank bankCode = bankService.selectOne(new EntityWrapper<TBank>().eq("bankCode", tBankNext.getDrecCode()));
- model.addAttribute("bank",bankCode.getBankName());
- model.addAttribute("bankNext",tBankNext.getBankName());
- model.addAttribute("bankCode",bankCode.getBankCode());
- model.addAttribute("bankNextCode",tBankNext.getId());
- if("auditing".equals(companyId.getApplicationStatus()) || "".equals(companyId.getApplicationStatus())){
+ model.addAttribute("bank", bankCode.getBankName());
+ model.addAttribute("bankNext", tBankNext.getBankName());
+ model.addAttribute("bankCode", bankCode.getBankCode());
+ model.addAttribute("bankNextCode", tBankNext.getId());
+ if ("auditing".equals(companyId.getApplicationStatus()) || "".equals(companyId.getApplicationStatus())) {
return PREFIX + "tEnterpriseWithdrawal_detail.html";
- }else if("account_need_verify".equals(companyId.getApplicationStatus())){
- model.addAttribute("bank",bankService.selectList(null));
- model.addAttribute("bankOne",bankNextService.selectList(null));
- MchApplicationResp mchApplicationResp = MchApplicationExample.retrieveById(companyId.getMchApplicationId());
-
- System.out.println(mchApplicationResp);
- String type = mchApplicationResp.getAcctValidation().getType();
- model.addAttribute("type",Integer.valueOf(type));
- if("1".equals(type)){
- model.addAttribute("money",mchApplicationResp.getAcctValidation().getPayAmount());
- model.addAttribute("no",mchApplicationResp.getAcctValidation().getDestAcctNo());
- }
+ } else if ("account_need_verify".equals(companyId.getApplicationStatus())) {
+ model.addAttribute("bank", bankService.selectList(null));
+ model.addAttribute("bankOne", bankNextService.selectList(null));
return PREFIX + "tEnterpriseWithdrawal_edit.html";
- }else if("succeeded".equals(companyId.getApplicationStatus())){
- model.addAttribute("bank",bankService.selectList(null));
- model.addAttribute("bankOne",bankNextService.selectList(null));
- model.addAttribute("type",3);
+ } else if ("succeeded".equals(companyId.getApplicationStatus())) {
+ model.addAttribute("bank", bankService.selectList(null));
+ model.addAttribute("bankOne", bankNextService.selectList(null));
+ model.addAttribute("type", 3);
return PREFIX + "tEnterpriseWithdrawal_edit.html";
- }else {
- model.addAttribute("bankOne",bankNextService.selectList(null));
- model.addAttribute("bank",bankService.selectList(null));
+ } else {
+ model.addAttribute("bankOne", bankNextService.selectList(null));
+ model.addAttribute("bank", bankService.selectList(null));
return PREFIX + "tEnterpriseWithdrawal_fail.html";
}
- }else {
- model.addAttribute("item",new TEnterpriseWithdrawal());
- model.addAttribute("bank",bankService.selectList(null));
+ } else {
+ model.addAttribute("item", new TEnterpriseWithdrawal());
+ model.addAttribute("bank", bankService.selectList(null));
return PREFIX + "tEnterpriseWithdrawal_add.html";
}
@@ -123,7 +112,7 @@
@RequestMapping("/tEnterpriseWithdrawal_update/{tEnterpriseWithdrawalId}")
public String tEnterpriseWithdrawalUpdate(@PathVariable Integer tEnterpriseWithdrawalId, Model model) {
TEnterpriseWithdrawal tEnterpriseWithdrawal = tEnterpriseWithdrawalService.selectById(tEnterpriseWithdrawalId);
- model.addAttribute("item",tEnterpriseWithdrawal);
+ model.addAttribute("item", tEnterpriseWithdrawal);
LogObjectHolder.me().set(tEnterpriseWithdrawal);
return PREFIX + "tEnterpriseWithdrawal_edit.html";
}
@@ -136,48 +125,51 @@
public Object list(String condition) {
return tEnterpriseWithdrawalService.selectList(null);
}
+
@RequestMapping(value = "/cityList")
@ResponseBody
- public Object cityList(String code,String name) {
- return bankNextService.selectList(new EntityWrapper<TBankNext>().eq("drecCode",code).like("bankName",name));
+ public Object cityList(String code, String name) {
+ return bankNextService.selectList(new EntityWrapper<TBankNext>().eq("drecCode", code).like("bankName", name));
}
-@Resource
-private ITImgMidService itImgMidService;
+
+ @Resource
+ private ITImgMidService itImgMidService;
+
/**
* 新增
*/
@RequestMapping(value = "/add")
@ResponseBody
- @Transactional(readOnly = false,propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
- public Object add(TEnterpriseWithdrawal tEnterpriseWithdrawal,Integer accountType,String code,String businessExpireTimeOne,String unifiedSocialCreditCodeExpireTimeOne,String certificateExpireTimeOne) {
+ @Transactional(readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+ public Object add(TEnterpriseWithdrawal tEnterpriseWithdrawal, Integer accountType, String code, String businessExpireTimeOne, String unifiedSocialCreditCodeExpireTimeOne, String certificateExpireTimeOne) {
tEnterpriseWithdrawal.setCode(code);
- List<TEnterpriseWithdrawal> companyId = tEnterpriseWithdrawalService.selectList(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", ShiroKit.getUser().getObjectId()));
- if(companyId.size()>0){
+ List<TEnterpriseWithdrawal> companyId = tEnterpriseWithdrawalService.selectList(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
+ if (companyId.size() > 0) {
return "5001";
}
- if(ToolUtil.isNotEmpty(businessExpireTimeOne)){
- tEnterpriseWithdrawal.setBusinessExpireTime(tEnterpriseWithdrawal.getBusinessExpireTime()+","+businessExpireTimeOne);
- }else {
- tEnterpriseWithdrawal.setBusinessExpireTime(tEnterpriseWithdrawal.getBusinessExpireTime()+",长期");
+ if (ToolUtil.isNotEmpty(businessExpireTimeOne)) {
+ tEnterpriseWithdrawal.setBusinessExpireTime(tEnterpriseWithdrawal.getBusinessExpireTime() + "," + businessExpireTimeOne);
+ } else {
+ tEnterpriseWithdrawal.setBusinessExpireTime(tEnterpriseWithdrawal.getBusinessExpireTime() + ",长期");
}
- if(ToolUtil.isNotEmpty(unifiedSocialCreditCodeExpireTimeOne)){
- tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime()+","+unifiedSocialCreditCodeExpireTimeOne);
- }else {
- tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime()+",长期");
+ if (ToolUtil.isNotEmpty(unifiedSocialCreditCodeExpireTimeOne)) {
+ tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime() + "," + unifiedSocialCreditCodeExpireTimeOne);
+ } else {
+ tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime() + ",长期");
}
- if(ToolUtil.isNotEmpty(certificateExpireTimeOne)){
- tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime()+","+certificateExpireTimeOne);
- }else {
- tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime()+",长期");
+ if (ToolUtil.isNotEmpty(certificateExpireTimeOne)) {
+ tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime() + "," + certificateExpireTimeOne);
+ } else {
+ tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime() + ",长期");
}
tEnterpriseWithdrawal.setIsAudit(1);
- tEnterpriseWithdrawal.setCompanyId(ShiroKit.getUser().getObjectId());
+ tEnterpriseWithdrawal.setCompanyId(shiroExtUtil.getUser().getObjectId());
tEnterpriseWithdrawal.setAccountType(accountType);
String randomString = ToolUtil.getRandomString(32);
tEnterpriseWithdrawal.setOutRequestNo(randomString);
- if(tEnterpriseWithdrawal.getEnterpriseType()==1){
+ if (tEnterpriseWithdrawal.getEnterpriseType() == 1) {
tEnterpriseWithdrawal.setAccountType(2);
}
try {
@@ -185,17 +177,12 @@
TBankNext tBankNext = bankNextService.selectById(depositBank);
tEnterpriseWithdrawal.setBankCode(tBankNext.getDrecCode());
tEnterpriseWithdrawal.setBankBranchCode(tBankNext.getBankCode());
- tEnterpriseWithdrawal.setCopy1(itImgMidService.selectOne(new EntityWrapper<TImgMid>().eq("url",tEnterpriseWithdrawal.getBusinessLicense())).getMid());
- tEnterpriseWithdrawal.setCopy2(itImgMidService.selectOne(new EntityWrapper<TImgMid>().eq("url",tEnterpriseWithdrawal.getCorporateIdCardFrontPicture())).getMid());
- tEnterpriseWithdrawal.setCopy3(itImgMidService.selectOne(new EntityWrapper<TImgMid>().eq("url",tEnterpriseWithdrawal.getCorporateIdCardReversePicture())).getMid());
- System.out.println("----------"+"进件gogogo"+"----------");
- MchApplicationStoreResp mchApplicationStoreResp = MchApplicationExample.create(tEnterpriseWithdrawal);
+ tEnterpriseWithdrawal.setCopy1(itImgMidService.selectOne(new EntityWrapper<TImgMid>().eq("url", tEnterpriseWithdrawal.getBusinessLicense())).getMid());
+ tEnterpriseWithdrawal.setCopy2(itImgMidService.selectOne(new EntityWrapper<TImgMid>().eq("url", tEnterpriseWithdrawal.getCorporateIdCardFrontPicture())).getMid());
+ tEnterpriseWithdrawal.setCopy3(itImgMidService.selectOne(new EntityWrapper<TImgMid>().eq("url", tEnterpriseWithdrawal.getCorporateIdCardReversePicture())).getMid());
+ System.out.println("----------" + "进件gogogo" + "----------");
- System.out.println("----------"+mchApplicationStoreResp+"----------");
-
- tEnterpriseWithdrawal.setOutRequestNo(mchApplicationStoreResp.getOutRequestNo());
- tEnterpriseWithdrawal.setMchApplicationId(mchApplicationStoreResp.getMchApplicationId());
tEnterpriseWithdrawal.setTransactionAuthorizationCode(Base64Util.encode(tEnterpriseWithdrawal.getTransactionAuthorizationCode()));
tEnterpriseWithdrawal.setBusinessLicense(tEnterpriseWithdrawal.getBusinessLicense());
tEnterpriseWithdrawal.setCorporateIdCardFrontPicture(tEnterpriseWithdrawal.getCorporateIdCardFrontPicture());
@@ -203,12 +190,9 @@
tEnterpriseWithdrawal.setApplicationStatus("auditing");
tEnterpriseWithdrawalService.insert(tEnterpriseWithdrawal);
return SUCCESS_TIP;
- }catch (UpyztException e){
- e.printStackTrace();
- return e.getIssue();
} catch (Exception e) {
e.printStackTrace();
- return ERROR;
+ return ERROR;
}
}
@@ -228,37 +212,33 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TEnterpriseWithdrawal tEnterpriseWithdrawal,Integer accountType,String businessExpireTimeOne,String unifiedSocialCreditCodeExpireTimeOne,String certificateExpireTimeOne) {
+ public Object update(TEnterpriseWithdrawal tEnterpriseWithdrawal, Integer accountType, String businessExpireTimeOne, String unifiedSocialCreditCodeExpireTimeOne, String certificateExpireTimeOne) {
tEnterpriseWithdrawal.setIsAudit(1);
tEnterpriseWithdrawal.setAccountType(accountType);
- if(tEnterpriseWithdrawal.getEnterpriseType()==1){
+ if (tEnterpriseWithdrawal.getEnterpriseType() == 1) {
tEnterpriseWithdrawal.setAccountType(2);
}
- if(ToolUtil.isNotEmpty(businessExpireTimeOne)){
- tEnterpriseWithdrawal.setBusinessExpireTime(tEnterpriseWithdrawal.getBusinessExpireTime()+","+businessExpireTimeOne);
- }else {
- tEnterpriseWithdrawal.setBusinessExpireTime(tEnterpriseWithdrawal.getBusinessExpireTime()+",长期");
+ if (ToolUtil.isNotEmpty(businessExpireTimeOne)) {
+ tEnterpriseWithdrawal.setBusinessExpireTime(tEnterpriseWithdrawal.getBusinessExpireTime() + "," + businessExpireTimeOne);
+ } else {
+ tEnterpriseWithdrawal.setBusinessExpireTime(tEnterpriseWithdrawal.getBusinessExpireTime() + ",长期");
}
- if(ToolUtil.isNotEmpty(unifiedSocialCreditCodeExpireTimeOne)){
- tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime()+","+unifiedSocialCreditCodeExpireTimeOne);
- }else {
- tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime()+",长期");
+ if (ToolUtil.isNotEmpty(unifiedSocialCreditCodeExpireTimeOne)) {
+ tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime() + "," + unifiedSocialCreditCodeExpireTimeOne);
+ } else {
+ tEnterpriseWithdrawal.setUnifiedSocialCreditCodeExpireTime(tEnterpriseWithdrawal.getUnifiedSocialCreditCodeExpireTime() + ",长期");
}
- if(ToolUtil.isNotEmpty(certificateExpireTimeOne)){
- tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime()+","+certificateExpireTimeOne);
- }else {
- tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime()+",长期");
+ if (ToolUtil.isNotEmpty(certificateExpireTimeOne)) {
+ tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime() + "," + certificateExpireTimeOne);
+ } else {
+ tEnterpriseWithdrawal.setCertificateExpireTime(tEnterpriseWithdrawal.getCertificateExpireTime() + ",长期");
}
try {
TEnterpriseWithdrawal enterpriseWithdrawal = tEnterpriseWithdrawalService.selectById(tEnterpriseWithdrawal.getId());
- MchApplicationResp mchApplicationResp = MchApplicationExample.retrieveById(enterpriseWithdrawal.getMchApplicationId());
- System.err.println(mchApplicationResp);
- if(enterpriseWithdrawal.getMchId()!=null){
+ if (enterpriseWithdrawal.getMchId() != null) {
tEnterpriseWithdrawal.setMchId(enterpriseWithdrawal.getMchId());
- }else {
- tEnterpriseWithdrawal.setMchId(mchApplicationResp.getMchId());
}
tEnterpriseWithdrawal.setOutRequestNo(ToolUtil.getRandomString(32));
String copy1 = tEnterpriseWithdrawalService.getmid(tEnterpriseWithdrawal.getCorporateIdCardFrontPicture());
@@ -274,14 +254,11 @@
tEnterpriseWithdrawal.setBankBranchCode(tBankNext.getBankCode());
- MchApplicationResp renew = MchApplicationExample.renew(tEnterpriseWithdrawal);
- tEnterpriseWithdrawal.setOutRequestNo(renew.getOutRequestNo());
- tEnterpriseWithdrawal.setMchApplicationId(renew.getMchApplicationId());
tEnterpriseWithdrawalService.updateById(tEnterpriseWithdrawal);
return SUCCESS_TIP;
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
- return ERROR;
+ return ERROR;
}
}
--
Gitblit v1.7.1