From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 573 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 374 insertions(+), 199 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index 1e2cd40..41b879f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -9,9 +9,11 @@
import com.alipay.api.request.AlipayMerchantIndirectAuthorderCreateRequest;
import com.alipay.api.request.AlipayMerchantIndirectAuthorderQuerystatusRequest;
import com.alipay.api.request.AntMerchantExpandIndirectImageUploadRequest;
+import com.alipay.api.request.AntMerchantExpandIndirectZftCreateRequest;
import com.alipay.api.response.AlipayMerchantIndirectAuthorderCreateResponse;
import com.alipay.api.response.AlipayMerchantIndirectAuthorderQuerystatusResponse;
import com.alipay.api.response.AntMerchantExpandIndirectImageUploadResponse;
+import com.alipay.api.response.AntMerchantExpandIndirectZftCreateResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,17 +26,23 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
+import com.dsh.guns.modular.system.util.HttpRequestUtil;
+import com.dsh.guns.modular.system.util.PayMoneyUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
+import com.github.binarywang.wxpay.service.BankService;
import com.mysql.cj.x.protobuf.MysqlxExpr;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -51,17 +59,21 @@
@Autowired
private TOperatorCityService operatorCityService;
@Autowired
+ private IOperatorAuthService operatorAuthService;
+ @Autowired
private IOperatorUserService operatorUserService;
@Autowired
private IUserService userService;
@Autowired
private ICityService cityService;
@Autowired
- private IOperatorAuthService operatorAuthService;
+ private PayMoneyUtil payMoneyUtil;
+
@Autowired
private IStoreService storeService;
-
-
+ private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
+ private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
+ private String aliAppid = "2021004105665036";//支付宝appid
/**
* 根据运营商id查询所有门店
*/
@@ -69,6 +81,7 @@
@ResponseBody
public List<TStore> getStores(Integer id)
{
+ payMoneyUtil.getMessage();
return storeService.list(new QueryWrapper<TStore>()
.eq("operatorId",id)
.ne("state",3));
@@ -149,6 +162,7 @@
page.setRecords(list);
return super.packForBT(page);
}
+
/**
* 跳转运营商商户去认证页面
*/
@@ -156,55 +170,189 @@
public String proportionAuth(Model model,@PathVariable("id") Integer id) {
model.addAttribute("id",id);
TOperator data = operatorService.getById(id);
+ User byId = userService.getById(data.getUserId());
+ model.addAttribute("user",byId);
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- model.addAttribute("provinceList",list);
+ model.addAttribute("list",list);
model.addAttribute("data",data);
- OperatorAuth info = operatorAuthService.getOne(new QueryWrapper<OperatorAuth>().eq("operatorId", id));
+ OperatorAuthAlipay info = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>().eq("operatorId", id));
model.addAttribute("item",info);
+
if (info==null){
- OperatorAuth operatorAuth = new OperatorAuth();
+ OperatorAuthAlipay operatorAuth = new OperatorAuthAlipay();
model.addAttribute("item",operatorAuth);
model.addAttribute("bodyType",0);
model.addAttribute("code",null);
model.addAttribute("reasons",null);
-
+ // 0不显示二维码
+ model.addAttribute("type",0);
}else{
- model.addAttribute("code",info.getQrCode());
- model.addAttribute("item",info);
model.addAttribute("bodyType",info.getBodyType());
- if (info.getRefuseReason()!=null && (!info.getRefuseReason().equals(""))){
- model.addAttribute("reasons",info.getRefuseReason());
- }else{
- model.addAttribute("reasons",null);
- }
+ model.addAttribute("accountType",info.getAccountType());
+ model.addAttribute("useType",info.getUseType());
+ model.addAttribute("cardType",info.getCardType());
+ model.addAttribute("reasons",info.getRefuseReason());
+// TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, info.getCityCode()));
+// List<TCity> district = cityService.list(new QueryWrapper<TCity>().eq("parent_id", one.getId()));
+// model.addAttribute("district",district);
+// if (info.getOrderStatus().equals("AUDIT_PASS")||info.getOrderStatus().equals("LEGAL_CONFIRM")||info.getOrderStatus().equals("CONTACT_CONFIRM")){
+// // 通过才展示二维码
+// model.addAttribute("type",1);
+// }else{
+// model.addAttribute("type",0);
+// }
+// model.addAttribute("code",info.getQrCode());
+// model.addAttribute("item",info);
+// model.addAttribute("bodyType",info.getBodyType());
+// if (info.getRefuseReason()!=null && (!info.getRefuseReason().equals(""))){
+// model.addAttribute("reasons",info.getRefuseReason());
+// }else{
+// model.addAttribute("reasons",null);
+// }
}
return PREFIX + "OperatorUser_proportionAuth.html";
}
+ /**
+ * 跳转运营商商户去认证页面 详情页面
+ */
+ @RequestMapping("/proportionAuth1/{id}")
+ public String proportionAuth1(Model model,@PathVariable("id") Integer id) {
+ model.addAttribute("id",id);
+ TOperator data = operatorService.getById(id);
+ User byId = userService.getById(data.getUserId());
+ model.addAttribute("user",byId);
+
+ model.addAttribute("data",data);
+ OperatorAuthAlipay info = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>()
+ .eq("operatorId", id));
+ model.addAttribute("item",info);
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list1",list1);
+ if (StringUtils.hasLength(info.getProvince())){
+ // 获取银行开户省
+ List<TCity> list4 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ // 获取银行开户市
+ TCity city = cityService.getOne(new QueryWrapper<TCity>().eq("code", info.getProvinceCode()));
+ List<TCity> list5 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, city.getId()));
+ model.addAttribute("list4",list4);
+ model.addAttribute("list5",list5);
+ }else{
+ List<TCity> list6 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list4",list6);
+ List<TCity> list5 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 1));
+ model.addAttribute("list5",list5);
+ }
+
+
+
+ model.addAttribute("bodyType",info.getBodyType());
+ model.addAttribute("accountType",info.getAccountType());
+ model.addAttribute("useType",info.getUseType());
+ model.addAttribute("cardType",info.getCardType());
+ model.addAttribute("reasons",info.getRefuseReason());
+
+
+
+// TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, info.getCityCode()));
+// List<TCity> district = cityService.list(new QueryWrapper<TCity>().eq("parent_id", one.getId()));
+// model.addAttribute("district",district);
+// if (info.getOrderStatus().equals("AUDIT_PASS")||info.getOrderStatus().equals("LEGAL_CONFIRM")||info.getOrderStatus().equals("CONTACT_CONFIRM")){
+// // 通过才展示二维码
+// model.addAttribute("type",1);
+// }else{
+// model.addAttribute("type",0);
+// }
+// model.addAttribute("code",info.getQrCode());
+// model.addAttribute("item",info);
+// model.addAttribute("bodyType",info.getBodyType());
+// if (info.getRefuseReason()!=null && (!info.getRefuseReason().equals(""))){
+// model.addAttribute("reasons",info.getRefuseReason());
+// }else{
+// model.addAttribute("reasons",null);
+// }
+
+ return PREFIX + "OperatorUser_proportionAuth_info.html";
+ }
+ /**
+ * 根据所选市 获取区
+ */
+ @RequestMapping(value = "/getDistrict")
+ @ResponseBody
+ public Object onChange(String cityCode) {
+ try {
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, cityCode));
+ List<TCity> parent_id = cityService.list(new QueryWrapper<TCity>().eq("parent_id", one.getId()));
+ return parent_id;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+ public static void main(String[] args) {
+ // 调用支付宝接口 通过银行卡号获取银行信息
+ String url = "https://ccdcapi.alipay.com/validateAndCacheCardInfo.json?_input_charset=utf-8&" +
+ "cardNo=6217003800041315031&cardBinCheck=true";
+ HashMap<String, String> hashMap = new HashMap<>();
+ String result = HttpRequestUtil.postRequest(url,hashMap);
+ System.err.println(result);
+ JSONObject json = JSONObject.parseObject(result);
+ String bank = json.getString("bank");
+ String cardType = json.getString("cardType");
+ System.err.println(bank);
+ System.err.println(cardType);
+
+ }
+
/**
* 支付宝商户认证提交
*/
@RequestMapping(value = "/auth")
@ResponseBody
- public Object auth(String beneficiaryEnd,String businessEnd,String legalEnd, String name,String phone,String number,Integer operatorId,String bodyType,Integer type,String businessName,String businessNumber,
- String legalRepresentative,String registerAddress,String businessTerm,String businessPicture,
- String legalPerson,String legalNumber,String legalPhone,String legalEmail,String legalTerm,
- String legalAddress,String legalFront,String legalBack,Integer accountType,String bank,
- String accountName,String province,String provinceCode,String city,String cityCode,
- String bankName,String bankNumber,String isBeneficiary,String beneficiary,String beneficiaryPhone,
- String beneficiaryNumber,String beneficiaryAddress,String beneficiaryTerm,String beneficiaryFront,String beneficiaryBack,
- String remark) {
+ public Object auth(Integer operatorId,String bodyType,String businessName,String aliasName,String businessNumber,
+ String license,String name,String phone,String shopProvinceCode,String shopProvince,String shopCityCode,
+ String shopCity, String shopDistrictCode,String shopDistrict,String registerAddress,String legalPerson,
+ String leagleNumber,String legalFront,String legalBack,String accountType,String alipayAccount,
+ String bankCard,String useType,String cardType,String bankName,String bankNameTwo,
+ String accountName,String provinceCode,String province,String cityCode,String city,String zfbAccount,
+ String iqImage) {
UUID uuid = UUID.randomUUID();
- OperatorAuth data = operatorAuthService.getOne(new QueryWrapper<OperatorAuth>().eq("operatorId", operatorId));
- OperatorAuth operatorAuth = new OperatorAuth();
+ // 通过运营商id查询
+ TOperator byId = operatorService.getById(operatorId);
+ Integer userId1 = byId.getUserId();
+ OperatorUser userId2 = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
+ .eq("userId", userId1));
+
+ OperatorAuthAlipay data = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>().eq("operatorId", operatorId));
+ // 调用支付宝接口 通过银行卡号获取银行信息
+ String url = "https://ccdcapi.alipay.com/validateAndCacheCardInfo.json?_input_charset=utf-8&" +
+ "cardNo="+bankCard+"&cardBinCheck=true";
+
+ HashMap<String, String> hashMap = new HashMap<>();
+ String result = HttpRequestUtil.postRequest(url,hashMap);
+ System.err.println(result);
+ JSONObject json2 = JSONObject.parseObject(result);
+ String bank = json2.getString("bank");
+ String cardType1 = json2.getString("cardType");
+ // 根据银行卡号查询所属银行
+ String group=bank;
+// if(StringUtils.hasLength(bankName)){
+// Pattern pattern = Pattern.compile(".*[\\u4e00-\\u9fa5]+"); // 只保留汉字部分
+// Matcher matcher = pattern.matcher(bankName);
+// group = matcher.group();
+// if (matcher.find()) {
+// System.out.println("银行名称简写为：" + matcher.group());
+// } else {
+// System.out.println("无法获取到银行名称简写！");
+// return 5007;
+// }
+// }
+
+ OperatorAuthAlipay operatorAuth = new OperatorAuthAlipay();
if (data!=null){
operatorAuth.setId(data.getId());
- if(businessPicture==null || businessPicture.equals("")){
- operatorAuth.setBusinessPicture(data.getBusinessPicture());
- businessPicture = data.getBusinessPicture();
- }
if(legalFront==null || legalFront.equals("")){
legalFront = data.getLegalFront();
operatorAuth.setLegalFront(data.getLegalFront());
@@ -213,182 +361,207 @@
legalBack = data.getLegalBack();
operatorAuth.setLegalBack(data.getLegalBack());
}
- if(beneficiaryFront==null || beneficiaryFront.equals("")){
- beneficiaryFront = data.getBeneficiaryFront();
- operatorAuth.setBeneficiaryFront(data.getBeneficiaryFront());
+ if(iqImage==null || iqImage.equals("")){
+ iqImage = data.getIqImage();
+ operatorAuth.setIqImage(data.getIqImage());
}
- if(beneficiaryBack==null || beneficiaryBack.equals("")){
- beneficiaryBack = data.getBeneficiaryBack();
- operatorAuth.setBeneficiaryBack(data.getBeneficiaryBack());
+
+ if(license==null || license.equals("")){
+ license = data.getCertImage();
+ operatorAuth.setCertImage(data.getCertImage());
+ }
+ }else{
+ operatorAuth.setLegalFront(legalFront);
+ operatorAuth.setLegalBack(legalBack);
+ operatorAuth.setIqImage(iqImage);
+ operatorAuth.setCertImage(license);
+ if(license==null || license.equals("")){
+ // 未上传营业执照
+ return 5001;
+ }
+ if(legalFront==null || legalFront.equals("")){
+ // 未上传法人身份证正面照
+ return 5002;
+ }
+ if(legalBack==null || legalBack.equals("")){
+ // 未上传法人身份证背面照
+ return 5003;
}
}
String numericUUID = uuid.toString().replaceAll("-", "");
+ operatorAuth.setOutBizNo(numericUUID);
+ operatorAuth.setOperatorId(operatorId);
+ operatorAuth.setRegisterAddress(registerAddress);
+ operatorAuth.setAliasName(aliasName);
+ operatorAuth.setBodyType(bodyType);
operatorAuth.setName(name);
operatorAuth.setPhone(phone);
- operatorAuth.setNumber(number);
- operatorAuth.setBusinessEnd(businessEnd);
- operatorAuth.setLegalEnd(legalEnd);
- operatorAuth.setBeneficiaryEnd(beneficiaryEnd);
- operatorAuth.setOperatorId(operatorId);
- operatorAuth.setBodyType(bodyType);
- operatorAuth.setType(type);
operatorAuth.setBusinessName(businessName);
operatorAuth.setBusinessNumber(businessNumber);
- operatorAuth.setLegalRepresentative(legalRepresentative);
- operatorAuth.setRegisterAddress(registerAddress);
- operatorAuth.setBusinessTerm(businessTerm);
- operatorAuth.setOutBizNo(numericUUID);
- operatorAuth.setBusinessPicture(businessPicture);
+ operatorAuth.setCertImage(license);
operatorAuth.setLegalPerson(legalPerson);
- operatorAuth.setLeagleNumber(legalNumber);
- operatorAuth.setLegalPhone(legalPhone);
- operatorAuth.setLegalEmail(legalEmail);
- operatorAuth.setLegalTerm(legalTerm);
- operatorAuth.setLegalAddress(legalAddress);
operatorAuth.setLegalFront(legalFront);
operatorAuth.setLegalBack(legalBack);
+ operatorAuth.setLeagleNumber(leagleNumber);
operatorAuth.setAccountType(accountType);
- operatorAuth.setBank(bank);
+ operatorAuth.setBankName(bankName);
operatorAuth.setAccountName(accountName);
+ operatorAuth.setBankCard(bankCard);
operatorAuth.setProvince(province);
operatorAuth.setProvinceCode(provinceCode);
operatorAuth.setCity(city);
operatorAuth.setCityCode(cityCode);
- operatorAuth.setBankName(bankName);
- operatorAuth.setBankNumber(bankNumber);
+ operatorAuth.setShopCity(shopCity);
+ operatorAuth.setShopProvince(shopProvince);
+ operatorAuth.setShopProvinceCode(shopProvinceCode);
+ operatorAuth.setShopCityCode(shopCityCode);
+ if(StringUtils.hasLength(province)&& province.equals("请选择省")){
+ operatorAuth.setProvince(null);
+ }
+ if(StringUtils.hasLength(city)&& province.equals("请选择市")){
+ operatorAuth.setCity(null);
+ }
+ operatorAuth.setProvince(province);
+ operatorAuth.setProvinceCode(provinceCode);
+ operatorAuth.setShopDistrict(shopDistrict);
+ operatorAuth.setShopDistrictCode(shopDistrictCode);
+ operatorAuth.setAlipayAccount(alipayAccount);
+ operatorAuth.setUseType(useType);
+ operatorAuth.setCardType(cardType);
+ operatorAuth.setBankNameTwo(bankNameTwo);
operatorAuth.setAuditState(0);
- operatorAuth.setIsBeneficiary(isBeneficiary);
- operatorAuth.setBeneficiary(beneficiary);
- operatorAuth.setBeneficiaryNumber(beneficiaryNumber);
- operatorAuth.setBeneficiaryAddress(beneficiaryAddress);
- operatorAuth.setBeneficiaryTerm(beneficiaryTerm);
- operatorAuth.setBeneficiaryFront(beneficiaryFront);
- operatorAuth.setBeneficiaryBack(beneficiaryBack);
operatorAuth.setRefuseReason("");
- operatorAuth.setRemark(remark);
-
-
+ operatorAuth.setZfbAccount(zfbAccount);
// 将图片上传至阿里存储
// 营业执照
- String string = uploadImg(businessPicture).toString();
+ String string = uploadImg(license).toString();
// 法人身份证正面照
- legalFront = uploadImg(legalFront).toString();
+ legalFront = uploadImg(legalFront).toString();
// 法人身份证背面照
- legalBack = uploadImg(legalBack).toString();
-
- if (bodyType.equals("ENTERPRISE")){
- // 受益人身份证正面照
- beneficiaryFront=uploadImg(beneficiaryFront).toString();
- // 受益人身份证背面照
- beneficiaryBack=uploadImg(beneficiaryBack).toString();
- }
-
-
- //第二步：提交申请单
- AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do","2021004123692417",
- "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCq1V7akWZ/V9mr8NGW2CihIbY93M7M33LpVM5y63qEuN7yqyJV197WT6c7uHBcttY6cJLawXLihgC8KF6ZzdXWbm4n4RiigxIaz9LbSVBjYplkNgG2rg7W7dB8wrrqcwBQU0n+pFX3KWJkHRXDugqE21VCGgzySKQBkhiztmTI/z039PdWp2RTGLiL/OuwVrPjQv3He2orYIZgADWid0mtZXCEFosDkaQDTEqCfuDEuMouEiaIk/lw0ZWxiR1Fvfr82nO0r94lM/CC1wNRif2+2ESR+YystsWQPm16eRgS3wAQz2cOTP4L5VNKNzcUAgxTQK3Bj8GvqrYUUlcC7VCTAgMBAAECggEAPKmYDTUkmIOxoATb6BzKEK3P8Re/t7CBNaoPxW8pCog7YyCyCJmnX6LZV7Oe8s1aNVZUT6nyCc5b5HTRYvxcutBr/W1JOiwg+bRiw8u86A3TOmqTITOdwWShbCwaA7binaN12x6wCByB+9r4J5Cgu5zHIbnubvqsgoJGk0ppb5XbyYkikOAXPHli4PUe4GOorSuhRdq3XlGWiMwh4yt48kF4vP+2ByuDOYQU6LjGs0wn/5LpN+ReLdXTab65Cz7WYTDrTndyIrhFg7cyT5m2gtiJuEgIJ45uaaeGNIecV6JSnRsEv4YD4m+I58yhyyvw9zd0Z5qP04QNjy7OK2UeQQKBgQD/EJpaVv0RR83Z6Hp2YVrPoiMz279U5bgkBbcxgr9GR2YYE3rrHqBdqch1Uitu+g6LIC+SDtib7yG9C7EqPHB3fsfEw8NtL54gy3OFbCcH3lqFxgtrCpQ2SIXQjd8932TpzcMdD6jzyUoSraT+lgkf2MgjqFiMbNVg50lGDyWujQKBgQCrdbXTttuazdwU0pdRFCuTz42iIJSZtHFUPvmbrBy7LFQ8NTN76dqLM1RUH7gJukPc4+Ax+DfpDgHZ4nQ2KSk9FweLqKSf10kojibKpc3nkgDRtUtSTar8fZn9VKTuXK1Ho0LUkjDlHjlEwUuf/Ef+IdjzXDJ2UPWHp2YzxvNDnwKBgBWGtjAnpUX/FF1upF83Si251lS7GAO3O3o2zUYtba0lu3UOt9H+DLS67oMQQ0AjdHTDa6BdBmTqoqNMyE/zN96t4Xg2uViOqz7DTOWWwhiE6IjftPj8tJN8PWbjglK7ds3QosXiG3UvqMO4yfL+gJiieAmiXI7FZKDABEwYXSrFAoGASXVe91vKbmJwPgOTjMsleGhd9+4ZfFjQjRWF/2oXzSFK3Zi1fAtO9ICDSp9kS9afqI2AyifcXF8B8AWTYHj2EBRDyVPxZAHqeBOfDwdGVkY5T59qq9JWxWJSjTSsjOrr2ltaEJSpmh/+zTQ7YEnH1ltOBcWkYQiCiSHxKZG9O2UCgYBfBTkjktzv81SnW47d0qRwmiXrcyObmXTe5fIW9e6KaB0SnzcVvoCmm7TTk+Bm4WqNmfb5k8U6J22vdxB1TPlRksnY+VZDM0Grv/xUII9G8oVQ4+NiE5XvQ7+nc5EBJ12of6GxE7/yXZiDld62q2sFZgrFzhvvHV+IADsu/VdIEw==","json","GBK",
- "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB","RSA2");
- AlipayMerchantIndirectAuthorderCreateRequest request = new AlipayMerchantIndirectAuthorderCreateRequest();
+ legalBack = uploadImg(legalBack).toString();
+ operatorAuthService.saveOrUpdate(operatorAuth);
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+ aliAppid,
+ appPrivateKey,
+ "json","GBK",
+ alipay_public_key,
+ "RSA2");
+ AntMerchantExpandIndirectZftCreateRequest request = new AntMerchantExpandIndirectZftCreateRequest();
String param = "{" +
- " \"out_biz_no\":\""+uuid+"\"," +
- " \"contact_person_info\":{" +
- " \"contact_name\":\""+name+"\"," +
- " \"contact_phone_no\":\""+phone+"\"," +
- " \"contact_card_no\":\""+number+"\"," +
- " \"contact_cert_type\":\"RESIDENT\"" +
- " }," +
- " \"auth_identity_info\":{" +
- " \"identity_type\":\""+bodyType+"\"," +
- " \"is_financial_org\":false," +
- " \"certificate_type\":\"BUSINESS_CERT\"," +
- " \"certificate_info\":{" +
- " \"cert_no\":\""+businessNumber+"\"," +
- " \"cert_image\":\""+string+"\"," +
- " \"merchant_name\":\""+businessName+"\"," +
- " \"legal_person_name\":\""+legalRepresentative+"\"," +
- " \"register_address\":\""+registerAddress+"\"," +
- " \"effect_time\":\""+businessTerm+"\"," +
- " \"expire_time\":\""+businessEnd+"\"" +
- " }," +
- " }," +
- " \"legal_person_info\":{" +
- " \"card_type\":\"RESIDENT\"," +
- " \"person_name\":\""+legalRepresentative+"\"," +
- " \"card_no\":\""+legalNumber+"\"," +
- " \"effect_time\":\""+legalTerm+"\"," +
- " \"expire_time\":\""+legalEnd+"\"," +
- " \"card_front_img\":\""+legalFront+"\"," +
- " \"card_back_img\":\""+legalBack+"\"," +
- " \"is_benefit_person\":"+isBeneficiary+"" +
- " },";
- String bene = " \"benefit_person_info\":{" +
- " \"person_name\":\""+beneficiary+"\"," +
- " \"card_no\":\""+beneficiaryNumber+"\"," +
- " \"card_type\":\"RESIDENT\"," +
- " \"effect_time\":\""+beneficiaryTerm+"\"," +
- " \"expire_time\":\""+beneficiaryEnd+"\"," +
- " \"card_front_img\":\""+beneficiaryFront+"\"," +
- " \"card_back_img\":\""+beneficiaryBack+"\"" +
- " },";
- if (bodyType.equals("ENTERPRISE")){
+ " \"external_id\":\""+numericUUID+"\"," +
+ " \"merchant_type\":\""+bodyType+"\"," +
+ " \"name\":\""+businessName+"\"," +
+ " \"alias_name\":\""+aliasName+"\"," +
+ " \"mcc\":\"B0068\"," +
+ " \"cert_no\":\""+businessNumber+"\"," +
+ " \"cert_type\":\"201\"," +
+ " \"cert_image\":\""+string+"\"," +
+ " \"legal_name\":\""+legalPerson+"\"," +
+ " \"legal_cert_no\":\""+leagleNumber+"\"," +
+ " \"legal_cert_front_image\":\""+legalFront+"\"," +
+ " \"legal_cert_back_image\":\""+legalBack+"\"," +
+ " \"contact_infos\":[" +
+ " {" +
+ " \"name\":\""+name+"\"," +
+ " \"mobile\":\""+phone+"\"," +
+ " }" +
+ " ],";
+ // todo 拼接
+ String biz_cards=" \"biz_cards\":[" +
+ " {" +
+ " \"account_holder_name\":\""+accountName+"\"," +
+ " \"account_no\":\""+bankCard+"\"," +
+ " \"account_inst_province\":\""+province+"\"," +
+ " \"account_inst_city\":\""+city+"\"," +
+ " \"account_branch_name\":\""+bankNameTwo+"\"," +
+ " \"usage_type\":\""+useType+"\"," +
+ " \"account_type\":\""+cardType+"\"," +
+ " \"account_inst_name\":\""+bankName+"\"," +
+ " \"account_inst_id\":\""+group+"\"," +
+ " }" +
+ " ]," ;
+ // 结算类型 支付宝账户 / 银行卡
+ String type ;
+ // 结算类型为支付宝 填写支付宝账号 结算类型为银行卡填写银行卡号
+ String account;
+ if (accountType.equals("bankCard")){
+ type = accountType;
+ account = bankCard;
+ }else{
+ type = accountType;
+ account = alipayAccount;
+ }
+ String res=
+ " \"service\":[" +
+ " \"app支付\"" +
+ " ]," +
+ " \"alipay_logon_id\":" +
+ " \""+zfbAccount+"\"" +
+ " ," +
+ " \"sites\":[" +
+ " {" +
+ " \"site_type\":\"02\"," +
+ " \"site_name\":\"玩湃生活\"," +
+ " \"tiny_app_id\":\"wx82f853a410b0c7c0\"" +
+ " }" +
+ " ]," +
+ " \"cert_name\":\""+businessName+"\","+
+ " \"binding_alipay_logon_id\":\""+zfbAccount+"\","+
+ " \"default_settle_rule\":{" +
+ " \"default_settle_type\":\""+type+"\"," +
+ " \"default_settle_target\":\""+account+"\"" +
+ " }" +
+ "}";
+ if (accountType.equals("bankCard")){
request.setBizContent(param
- + bene+
- "}");
+ + biz_cards+res);
}else{
request.setBizContent(param
- +
- "}");
+ +res);
}
-
- AlipayMerchantIndirectAuthorderCreateResponse response = null;
+ AntMerchantExpandIndirectZftCreateResponse response = null;
try {
response = alipayClient.execute(request);
} catch (AlipayApiException e) {
e.printStackTrace();
}
if(response.isSuccess()){
- System.out.println("上传认证单");
+ System.out.println("调用成功");
JSONObject json = JSONObject.parseObject(response.getBody());
- JSONObject json1 = json.getJSONObject("alipay_merchant_indirect_authorder_create_response");
- String order_no = json1.getString("order_no");
- String order_status = json1.getString("order_status");
-// // 申请单号
-// String orderNo = r.getString("order_no");
- /**
- * 状态 审核中(AUDITING)、待联系人确认（CONTACT_CONFIRM），
- * 待法人确认（LEGAL_CONFIRM）、审核通过(AUDIT_PASS)、
- * 审核失败(AUDIT_REJECT)、已冻结(AUDIT_FREEZE)、
- * 已撤回(CANCELED)、联系人处理中(CONTACT_PROCESSING)
- */
-// String orderStatus = r.getString("order_status");
+ JSONObject json1 = json.getJSONObject("ant_merchant_expand_indirect_zft_create_response");
+ String order_no = json1.getString("order_id");
+ System.err.println("订单号"+order_no);
operatorAuth.setOrderNo(order_no);
- operatorAuth.setOrderStatus(order_status);
+ operatorAuth.setRefuseReason("");
operatorAuthService.saveOrUpdate(operatorAuth);
- // 通过运营商id找到用户id
- TOperator byId = operatorService.getById(operatorId);
- if (byId!=null){
- Integer userId = byId.getUserId();
- OperatorUser userId1 = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("userId", userId));
- if (userId1!=null){
- // 设置为审核中状态
- userId1.setAlipayAudit(1);
- userId1.setWechatAudit(1);
- }
+ Integer userId = operatorService.getById(operatorId).getUserId();
+ OperatorUser user = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("userId", userId));
+ user.setAlipayAudit(1);
+ // 01是企业
+ if (bodyType.equals("01")){
+ user.setAlipayType(2);
+ }else{
+ user.setAlipayType(1);
}
+ operatorUserService.saveOrUpdate(user);
} else {
- System.out.println("调用失败");
+ if (response.getCode().equals("40004")){
+ String subMsg = response.getSubMsg();
+ return ResultUtil.error(subMsg);
+ }
}
- return SUCCESS_TIP;
+ return ResultUtil.success();
}
public static Object uploadImg(String img){
- String privateKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCq1V7akWZ/V9mr8NGW2CihIbY93M7M33LpVM5y63qEuN7yqyJV197WT6c7uHBcttY6cJLawXLihgC8KF6ZzdXWbm4n4RiigxIaz9LbSVBjYplkNgG2rg7W7dB8wrrqcwBQU0n+pFX3KWJkHRXDugqE21VCGgzySKQBkhiztmTI/z039PdWp2RTGLiL/OuwVrPjQv3He2orYIZgADWid0mtZXCEFosDkaQDTEqCfuDEuMouEiaIk/lw0ZWxiR1Fvfr82nO0r94lM/CC1wNRif2+2ESR+YystsWQPm16eRgS3wAQz2cOTP4L5VNKNzcUAgxTQK3Bj8GvqrYUUlcC7VCTAgMBAAECggEAPKmYDTUkmIOxoATb6BzKEK3P8Re/t7CBNaoPxW8pCog7YyCyCJmnX6LZV7Oe8s1aNVZUT6nyCc5b5HTRYvxcutBr/W1JOiwg+bRiw8u86A3TOmqTITOdwWShbCwaA7binaN12x6wCByB+9r4J5Cgu5zHIbnubvqsgoJGk0ppb5XbyYkikOAXPHli4PUe4GOorSuhRdq3XlGWiMwh4yt48kF4vP+2ByuDOYQU6LjGs0wn/5LpN+ReLdXTab65Cz7WYTDrTndyIrhFg7cyT5m2gtiJuEgIJ45uaaeGNIecV6JSnRsEv4YD4m+I58yhyyvw9zd0Z5qP04QNjy7OK2UeQQKBgQD/EJpaVv0RR83Z6Hp2YVrPoiMz279U5bgkBbcxgr9GR2YYE3rrHqBdqch1Uitu+g6LIC+SDtib7yG9C7EqPHB3fsfEw8NtL54gy3OFbCcH3lqFxgtrCpQ2SIXQjd8932TpzcMdD6jzyUoSraT+lgkf2MgjqFiMbNVg50lGDyWujQKBgQCrdbXTttuazdwU0pdRFCuTz42iIJSZtHFUPvmbrBy7LFQ8NTN76dqLM1RUH7gJukPc4+Ax+DfpDgHZ4nQ2KSk9FweLqKSf10kojibKpc3nkgDRtUtSTar8fZn9VKTuXK1Ho0LUkjDlHjlEwUuf/Ef+IdjzXDJ2UPWHp2YzxvNDnwKBgBWGtjAnpUX/FF1upF83Si251lS7GAO3O3o2zUYtba0lu3UOt9H+DLS67oMQQ0AjdHTDa6BdBmTqoqNMyE/zN96t4Xg2uViOqz7DTOWWwhiE6IjftPj8tJN8PWbjglK7ds3QosXiG3UvqMO4yfL+gJiieAmiXI7FZKDABEwYXSrFAoGASXVe91vKbmJwPgOTjMsleGhd9+4ZfFjQjRWF/2oXzSFK3Zi1fAtO9ICDSp9kS9afqI2AyifcXF8B8AWTYHj2EBRDyVPxZAHqeBOfDwdGVkY5T59qq9JWxWJSjTSsjOrr2ltaEJSpmh/+zTQ7YEnH1ltOBcWkYQiCiSHxKZG9O2UCgYBfBTkjktzv81SnW47d0qRwmiXrcyObmXTe5fIW9e6KaB0SnzcVvoCmm7TTk+Bm4WqNmfb5k8U6J22vdxB1TPlRksnY+VZDM0Grv/xUII9G8oVQ4+NiE5XvQ7+nc5EBJ12of6GxE7/yXZiDld62q2sFZgrFzhvvHV+IADsu/VdIEw==";
- String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB";
+ String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
+ String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
+ String aliAppid = "2021004105665036";//支付宝appid
AlipayConfig alipayConfig = new AlipayConfig();
alipayConfig.setServerUrl("https://openapi.alipay.com/gateway.do");
- alipayConfig.setAppId("2021004123692417");
- alipayConfig.setPrivateKey(privateKey);
+ alipayConfig.setAppId(aliAppid);
+ alipayConfig.setPrivateKey(appPrivateKey);
alipayConfig.setFormat("json");
- alipayConfig.setAlipayPublicKey(alipayPublicKey);
+ alipayConfig.setAlipayPublicKey(alipay_public_key);
alipayConfig.setCharset("UTF8");
alipayConfig.setSignType("RSA2");
AlipayClient alipayClient = null;
@@ -429,8 +602,8 @@
*/
@RequestMapping(value = "/proportion")
@ResponseBody
- public Object auth(String alipayProportion,String wechatProportion,Integer operatorIdOne ) {
- OperatorUser id = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("id", operatorIdOne));
+ public Object auth(Integer operatorIdOne ,String alipayProportion,String wechatProportion) {
+ OperatorUser id = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("operatorId", operatorIdOne));
id.setAlipayProportion(alipayProportion);
id.setWechatProportion(wechatProportion);
operatorUserService.updateById(id);
@@ -442,9 +615,11 @@
@RequestMapping("/proportion/{id}")
public String proportion(Model model,@PathVariable("id") Integer id) {
OperatorUser o = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("operatorId", id));
- model.addAttribute("operatorIdOne",o.getId());
+ model.addAttribute("id",id);
model.addAttribute("alipayProportion",o.getAlipayProportion());
model.addAttribute("wechatProportion",o.getWechatProportion());
+ model.addAttribute("alipayNum",o.getAlipayNum());
+ model.addAttribute("wechatNum",o.getWechatNum());
return PREFIX + "OperatorUser_proportion.html";
}
/**
@@ -610,47 +785,47 @@
data.setState(1);
operatorService.updateById(data);
if (type != 1){
- if (SinataUtil.isNotEmpty(comArr)){
- JSONArray jsonArray = JSON.parseArray(comArr);
- int size = jsonArray.size();
- for (int i = 0; i < size; i++) {
- JSONObject jsonObject = jsonArray.getJSONObject(i);
- TOperatorCity province = new TOperatorCity();
- TOperatorCity city = new TOperatorCity();
- TOperatorCity one1 = operatorCityService.getOne(new QueryWrapper<TOperatorCity>()
- .eq("name", jsonObject.getString("province"))
- .eq("operatorId", data.getId()));
- // 省
- if (one1==null){
- province.setName(jsonObject.getString("province"));
- province.setCode(jsonObject.getInteger("provinceCode"));
- province.setPid(0);
- province.setType(jsonObject.getInteger("areaType"));
- province.setOperatorId(data.getId());
- city.setPid(province.getId());
- operatorCityService.save(province);
- // 市
- if (!jsonObject.getString("city").equals("")){
- city.setName(jsonObject.getString("city"));
- city.setCode(jsonObject.getInteger("cityCode"));
+ if (SinataUtil.isNotEmpty(comArr)){
+ JSONArray jsonArray = JSON.parseArray(comArr);
+ int size = jsonArray.size();
+ for (int i = 0; i < size; i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ TOperatorCity province = new TOperatorCity();
+ TOperatorCity city = new TOperatorCity();
+ TOperatorCity one1 = operatorCityService.getOne(new QueryWrapper<TOperatorCity>()
+ .eq("name", jsonObject.getString("province"))
+ .eq("operatorId", data.getId()));
+ // 省
+ if (one1==null){
+ province.setName(jsonObject.getString("province"));
+ province.setCode(jsonObject.getInteger("provinceCode"));
+ province.setPid(0);
+ province.setType(jsonObject.getInteger("areaType"));
+ province.setOperatorId(data.getId());
city.setPid(province.getId());
- city.setType(jsonObject.getInteger("areaType"));
- city.setOperatorId(data.getId());
- operatorCityService.save(city);
- }
- }else{
- // 市
- if (!jsonObject.getString("city").equals("")){
- city.setName(jsonObject.getString("city"));
- city.setCode(jsonObject.getInteger("cityCode"));
- city.setPid(one1.getId());
- city.setType(jsonObject.getInteger("areaType"));
- city.setOperatorId(data.getId());
- operatorCityService.save(city);
+ operatorCityService.save(province);
+ // 市
+ if (!jsonObject.getString("city").equals("")){
+ city.setName(jsonObject.getString("city"));
+ city.setCode(jsonObject.getInteger("cityCode"));
+ city.setPid(province.getId());
+ city.setType(jsonObject.getInteger("areaType"));
+ city.setOperatorId(data.getId());
+ operatorCityService.save(city);
+ }
+ }else{
+ // 市
+ if (!jsonObject.getString("city").equals("")){
+ city.setName(jsonObject.getString("city"));
+ city.setCode(jsonObject.getInteger("cityCode"));
+ city.setPid(one1.getId());
+ city.setType(jsonObject.getInteger("areaType"));
+ city.setOperatorId(data.getId());
+ operatorCityService.save(city);
+ }
}
}
}
- }
}
return ResultUtil.success("添加成功");
}
--
Gitblit v1.7.1