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/OperatorUserController.java | 102 +++++++++++++++++++++++++++++++++------------------
1 files changed, 66 insertions(+), 36 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
index 8190a57..6f35ce3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
@@ -7,25 +7,31 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.account.StoreStaffClient;
import com.dsh.course.feignClient.account.model.TStoreStaff;
+import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
+import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.SinataUtil;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.service.impl.TOperatorUserServiceImpl;
import com.dsh.guns.modular.system.util.ResultUtil;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
@@ -63,50 +69,74 @@
/**
- * 跳转运营商商户去认证页面
- */
- @RequestMapping("/proportion/{id}")
- public String update(Model model,@PathVariable("id") Integer id) {
- List<TCity> provinceList = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- model.addAttribute("provinceList",provinceList);
- List<Bank> bankList = operatorService.getBankList();
- TStore store = storeService.getOne(new QueryWrapper<TStore>().eq("operatorId", id));
- model.addAttribute("storeName",store.getName());
-// TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(store.getStoreStaffId());
-// model.addAttribute("storeStaff",storeByStoreStaffId.getName());
-// model.addAttribute("storePhone",storeByStoreStaffId.getPhone());
- model.addAttribute("bankList",bankList);
- return PREFIX + "OperatorUser_auth.html";
- }
- /**
* 获取运营商列表
*/
@RequestMapping(value = "/listAll")
@ResponseBody
public Object listAll(String province,String city,String userName, String phone,Integer platform,Integer type,Integer state) {
- Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
- List<Map<String,Object>> list = operatorUserService.listAll(page,province,city,userName,phone,platform,type,state);
- page.setRecords(list);
- return super.packForBT(page);
+
+ List<OperatorUserVO> list = operatorUserService.
+ listAll(province,city,userName,phone,platform,type,state);
+ return list;
}
- /**
- * 批量重置密码
- * @return
- */
- @RequestMapping(value = "/addProportion")
+ @RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
+ @ApiOperation(value = "微信平台商户进件")
@ResponseBody
- public Object pwd(Integer id, BigDecimal alipay,BigDecimal wechat) {
- List<OperatorUser> list = operatorUserService.list(new QueryWrapper<OperatorUser>().eq("operatorId", id));
- for (OperatorUser operatorUser : list) {
- if (operatorUser.getPlatform()==1){
- operatorUser.setProportion(wechat);
- operatorUserService.updateById(operatorUser);
- }else {
- operatorUser.setProportion(alipay);
- operatorUserService.updateById(operatorUser);
- }
- }
+ public Object mgtShopAuth(Integer operatorId,String aliasName, String name,String phone,
+ String bodyType,String businessName,String businessNumber,String legalPerson,
+ String legalRepresentative,String registerAddress,String businessTerm,String businessPicture,
+ String businessEnd,String legalNumber,String accountType,
+ Integer blBusinessFoeverFlag, String leagleNumber,String legalAddress,
+ String legalTerm,String legalEnd, Integer lpIcForeverFlag,String legalFront,String legalBack,
+ String legalPhone,String legalEmail, String settlementAccountType,String saBank,String saAccountName,
+ String saBankProvinceCode,String saBankCityCode, String saBankName,String saNumber,String baPics,
+ String baDesc,Integer owner, String uboName,String uboIdCard,String uboIcStartDate,String uboIcEndDate,
+ String uboIcFront,String uboIcBack, String uboIcAddress) {
+ MgtShopAuthDto mgtShopAuthDto = new MgtShopAuthDto();
+ Integer userId = Objects.requireNonNull(UserExt.getUser()).getId();
+ mgtShopAuthDto.setUserId(userId);
+ mgtShopAuthDto.setAuthId("1");
+ mgtShopAuthDto.setShopId(Long.valueOf(operatorId));
+ mgtShopAuthDto.setShopName(businessName);
+ mgtShopAuthDto.setShopownerName(name);
+ mgtShopAuthDto.setShopownerPhone(phone);
+ mgtShopAuthDto.setMainType(Integer.valueOf(bodyType));
+ mgtShopAuthDto.setBlShopName(businessName);
+ mgtShopAuthDto.setBlNumber(businessNumber);
+ mgtShopAuthDto.setBlCorporateName(legalRepresentative);
+ mgtShopAuthDto.setBlRegisteredAddress(registerAddress);
+ mgtShopAuthDto.setBlBusinessStartTime(businessTerm);
+ mgtShopAuthDto.setBlBusinessDeanline(businessEnd);
+ mgtShopAuthDto.setBlBusinessFoeverFlag(blBusinessFoeverFlag);
+ mgtShopAuthDto.setBlImage(businessPicture);
+ mgtShopAuthDto.setLpCorporateName(legalPerson);
+ mgtShopAuthDto.setLpIdCard(legalNumber);
+ mgtShopAuthDto.setLpIdAddress(legalAddress);
+ mgtShopAuthDto.setLpIcStartDate(legalTerm);
+ mgtShopAuthDto.setLpIcEndDate(legalEnd);
+ mgtShopAuthDto.setLpIcForeverFlag(lpIcForeverFlag);
+ mgtShopAuthDto.setLpIcFront(legalFront);
+ mgtShopAuthDto.setLpIcBack(legalBack);
+ mgtShopAuthDto.setLpMobilePhone(legalPhone);
+ mgtShopAuthDto.setLpContactEmail("法人邮箱");
+ mgtShopAuthDto.setSettlementAccountType(accountType);
+ mgtShopAuthDto.setSaBank("开户行");
+ mgtShopAuthDto.setSaAccountName("开户名称");
+ mgtShopAuthDto.setSaBankProvinceCode("开户所在省");
+ mgtShopAuthDto.setSaBankCityCode("开户所在市");
+ mgtShopAuthDto.setSaBankName("开户行全称");
+ mgtShopAuthDto.setSaNumber("银行卡号");
+ mgtShopAuthDto.setOwner(1);
+ mgtShopAuthDto.setUboName("ck");
+ mgtShopAuthDto.setUboIdCard("513701199910156123");
+ mgtShopAuthDto.setUboIcStartDate("2020-05-05");
+ mgtShopAuthDto.setUboIcEndDate("2025-05-05");
+ mgtShopAuthDto.setUboIcFront("受益人身份证正面");
+ mgtShopAuthDto.setUboIcBack("受益人身份证正面");
+ mgtShopAuthDto.setUboIcAddress("受益人居住地址");
+ operatorUserService.mgtShopAuth(mgtShopAuthDto);
return SUCCESS_TIP;
}
+
}
--
Gitblit v1.7.1