合并代码

Pu Zhibing

4 天以前 8522e469e00e1cf6c0410165b0f76c806c13ca83

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java

@@ -37,21 +37,21 @@
@Controller
@RequestMapping("/tEnterpriseWithdrawal")
public class TEnterpriseWithdrawalController extends BaseController {
    

    private String PREFIX = "/system/tEnterpriseWithdrawal/";
    

    @Autowired
    private ITEnterpriseWithdrawalService tEnterpriseWithdrawalService;
    

    @Autowired
    private ITBankService bankService;
    

    @Autowired
    private ITBankNextService bankNextService;
    
    @Resource

    @Autowired
    private ShiroExtUtil shiroExtUtil;
    

    /**
     * 跳转到首页
     */
@@ -77,22 +77,22 @@
            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));
                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";
        }

@@ -112,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";
    }
@@ -125,42 +125,45 @@
    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", shiroExtUtil.getUser().getObjectId()));
        if(companyId.size()>0){
        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)){
        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() + ",长期");
        }
    

        tEnterpriseWithdrawal.setIsAudit(1);
        tEnterpriseWithdrawal.setCompanyId(shiroExtUtil.getUser().getObjectId());
        tEnterpriseWithdrawal.setAccountType(accountType);
@@ -174,12 +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"+"----------");
    
    
            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" + "----------");


            tEnterpriseWithdrawal.setTransactionAuthorizationCode(Base64Util.encode(tEnterpriseWithdrawal.getTransactionAuthorizationCode()));
            tEnterpriseWithdrawal.setBusinessLicense(tEnterpriseWithdrawal.getBusinessLicense());
            tEnterpriseWithdrawal.setCorporateIdCardFrontPicture(tEnterpriseWithdrawal.getCorporateIdCardFrontPicture());
@@ -209,32 +212,32 @@
     */
    @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());
            if(enterpriseWithdrawal.getMchId()!=null){
            if (enterpriseWithdrawal.getMchId() != null) {
                tEnterpriseWithdrawal.setMchId(enterpriseWithdrawal.getMchId());
            }
            tEnterpriseWithdrawal.setOutRequestNo(ToolUtil.getRandomString(32));
@@ -253,9 +256,9 @@

            tEnterpriseWithdrawalService.updateById(tEnterpriseWithdrawal);
            return SUCCESS_TIP;
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return  ERROR;
            return ERROR;
        }
    }