czg_team
/
newadmin
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

菜单管理增改查，支付宝打款，

This commit is contained in:
liuyingfang 2023-08-02 18:15:50 +08:00
parent df87c47b95
commit 46127a0272
16 changed files with 578 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
newadmin/admin/pom.xml
View File

@ -71,6 +71,16 @@
<artifactId>jxl</artifactId>
<version>2.6.12</version>
</dependency>
<dependency>
<groupId>com.alipay.sdk</groupId>
<artifactId>alipay-sdk-java</artifactId>
<version>4.38.37.ALL</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
</dependencies>

58
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AppMenuController.java Normal file
View File

@ -0,0 +1,58 @@
package com.chaozhanggui.admin.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chaozhanggui.admin.system.service.AppMenuService;
import com.chaozhanggui.common.system.config.RespBody;
import com.chaozhanggui.dao.system.entity.TbPlussAppMenu;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import static com.chaozhanggui.common.system.util.AlipayTransfer.testAlipayTransfer;
/**
* app菜单相关
* @author lyf
*/
@CrossOrigin(origins = "*")
@RestController
@RequestMapping("/AppMenu")
@Slf4j
public class AppMenuController {
@Resource
private AppMenuService appMenuService;
/**
* app菜单相关
* @param page
* @param size
* @return
*/
@GetMapping("/page")
@ResponseBody
public RespBody page(@RequestParam("page")Integer page, @RequestParam("size")Integer size) {
return appMenuService.getAppMenuList(page,size);
}
@PostMapping("/save")
public RespBody save(@RequestBody TbPlussAppMenu entity) {
return appMenuService.saveAppMenu(entity);
}
@PostMapping("/update")
public RespBody update(@RequestBody TbPlussAppMenu entity) {
return appMenuService.saveAppMenu(entity);
}
@PostMapping("/AlipayTransferTest")
public RespBody AlipayTransferTest() throws Exception{
String s = testAlipayTransfer();
return new RespBody(s);
}
}

128
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantChannelController.java Normal file
View File

@ -0,0 +1,128 @@
package com.chaozhanggui.admin.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chaozhanggui.dao.system.entity.TbPlussMerchantChannelStatus;
import com.chaozhanggui.dao.system.entity.VO.UserInfoVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
/**
* 商户通道相关信息
* @author lyf
*/
@CrossOrigin(origins = "*")
@RestController
@RequestMapping("/merchantChannel")
@Slf4j
public class MerchantChannelController {
// @GetMapping(value = "/queryUserAppByPage")
// public Map<String, Object> queryUserAppByPage(@RequestParam(defaultValue = "1") Integer currPage, Integer size,
// UserInfoVO userInfoVO){
//
// Map<String, Object> map = new HashMap<>();
// map.put("pageSize", size);
// map.put("offset", (currPage - 1) * size);
// // 筛选出推广员
// if (StringUtils.isNotEmpty(userInfoVO.getUserName())) {
// map.put("userName", userInfoVO.getUserName());
// }
// if (userInfoVO.getUserId() != null) {
// map.put("userId", userInfoVO.getUserId());
// } else {
// userInfoVO.setSameIp(null);
// }
//
// if (userInfoVO.getSameIp() != null) {
// map.put("sameIp", "1");
// }
//
// if (StringUtils.isNotEmpty(userInfoVO.getPhone())) {
// map.put("phone", userInfoVO.getPhone());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getMerchantCode())) {
// map.put("merchantCode", userInfoVO.getMerchantCode());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getParentPhone())) {
// map.put("parentPhone", userInfoVO.getParentPhone());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getMerchantType())) {
// map.put("merchantType", userInfoVO.getMerchantType());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getMerchantId())) {
// map.put("merchantId", userInfoVO.getMerchantId());
// }
// if (userInfoVO.getStatus() != null) {
// map.put("status", userInfoVO.getStatus());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getUserType())) {
// map.put("userType", userInfoVO.getUserType());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getParentUserType())) {
// map.put("parentUserType", userInfoVO.getParentUserType());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getInviteNum())) {
// map.put("inviteNum", userInfoVO.getInviteNum());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getAlias())) {
// map.put("alias", userInfoVO.getAlias());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getWxMercNo())) {
// map.put("wxMercNo", userInfoVO.getWxMercNo());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getZfbMercNo())) {
// map.put("zfbMercNo", userInfoVO.getZfbMercNo());
// }
// if (StringUtils.isNotEmpty(userInfoVO.getMcsStatus())) {
// if ("0".equals(userInfoVO.getMcsStatus())) {
// userInfoVO.setMcsStatus("1");
// userInfoVO.setThirdStatus(TbPlussMerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
// map.put("thirdStatus", userInfoVO.getThirdStatus());
// } else if ("1".equals(userInfoVO.getMcsStatus())) {
// userInfoVO.setThirdStatus("100");
// map.put("thirdStatus", userInfoVO.getThirdStatus());
// }
// map.put("mcsStatus", userInfoVO.getMcsStatus());
// }
//
// if (StringUtils.isNotEmpty(userInfoVO.getPpStatus())) {
// if ("0".equals(userInfoVO.getPpStatus())) {
// userInfoVO.setPpStatus("1");
// userInfoVO.setPpThirdStatus(TbPlussMerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
// map.put("ppThirdStatus", userInfoVO.getPpThirdStatus());
// } else if ("1".equals(userInfoVO.getPpStatus())) {
// userInfoVO.setPpThirdStatus("100");
// map.put("ppThirdStatus", userInfoVO.getPpThirdStatus());
// }
// map.put("ppStatus", userInfoVO.getPpStatus());
// }
//
// Page<UserInfoVO> pageData = uaService.queryUserInfoVOPage(map);
// if (!pageData.getRecords().isEmpty()) {
// for (UserInfoVO infoVO : pageData.getRecords()) {
// if ("agent".equals(infoVO.getUserType()) && infoVO.getParentUserId() != null) {
// infoVO.setUserType("agent_agency");
// }
// if (infoVO.getParentUserType() != null && "agent".equals(infoVO.getParentUserType())) {
// Integer parentUserId = uaService.getParentUserId(infoVO.getParentUserId());
// if (parentUserId > 0) {
// infoVO.setParentUserType("agent_agency");
// }
// }
// }
// }
// Long count = pageData.getTotal();
// Map<String, Object> result = new HashMap<>();
// result.put("code", 200);
// result.put("userAppList", pageData.getRecords());
// result.put("count", count);
// result.put("pageCount", StringUtil.getPageCount(count.intValue(), size));
// result.put("currPage", currPage);
// return result;
// }
}

46
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AppMenuService.java Normal file
View File

@ -0,0 +1,46 @@
package com.chaozhanggui.admin.system.service;
import com.chaozhanggui.common.system.config.RespBody;
import com.chaozhanggui.dao.system.dao.TbPlussAppMenuMapper;
import com.chaozhanggui.dao.system.entity.TbPlussAppGuide;
import com.chaozhanggui.dao.system.entity.TbPlussAppMenu;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* @author lyf
*/
@Service
@Slf4j
public class AppMenuService {
@Resource
private TbPlussAppMenuMapper appMenuMapper;
public RespBody getAppMenuList(Integer pageNum, Integer pageSize){
PageHelper.startPage(pageNum, pageSize);
List<TbPlussAppMenu> appGuides = appMenuMapper.selectAppMenuList();
PageInfo pageInfo=new PageInfo(appGuides);
return new RespBody("000000",pageInfo);
}
public RespBody saveAppMenu(TbPlussAppMenu entity){
int insert = appMenuMapper.insertSelective(entity);
if (insert>0) {
return new RespBody("000000");
}
log.error("增加错误");
return new RespBody("000052");
}
public RespBody updateAppMenu(TbPlussAppMenu entity){
int insert = appMenuMapper.insertSelective(entity);
if (insert>0) {
return new RespBody("000000");
}
log.error("增加错误");
return new RespBody("000052");
}
}

77
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelService.java Normal file
View File

@ -0,0 +1,77 @@
package com.chaozhanggui.admin.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chaozhanggui.dao.system.entity.VO.UserInfoVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.*;
/**
* @author lyf
*/
@Service
@Slf4j
public class MerchantChannelService {
// public Page<UserInfoVO> queryUserInfoVOPage(Map<String, Object> map) {
// List<UserInfoVO> result = baseMapper.queryUserInfoVOPage(map);
//
// long page = ((Integer) map.get("offset")).longValue() + 1L;
// long pageSize = ((Integer) map.get("pageSize")).longValue();
// Page<UserInfoVO> pageResult = new Page<>(page, pageSize);
// pageResult.setRecords(result);
// Long count = baseMapper.queryUserPageCount(map).longValue();
// pageResult.setTotal(count);
//
// if (result.isEmpty()) {
// return pageResult;
// }
// List<String> merchantCodeList = new ArrayList<>();
// List<Integer> userIdList = new ArrayList<>();
// for (UserInfoVO userInfoVO : result) {
// merchantCodeList.add(userInfoVO.getMerchantCode() + "");
// userIdList.add(Integer.valueOf(userInfoVO.getUserId() + ""));
// }
//
// List<MerchantChannelStatusVO> channelStatusList = mcsService.listByMerchantCodeList(merchantCodeList);
// Map<String, Integer> mapMerchantId = new HashMap<>();
// for (UserInfoVO userInfoVO : result) {
// List<MerchantChannelStatus> statusList = userInfoVO.getChannelStatusList();
// if (statusList == null) {
// statusList = new ArrayList<>();
// userInfoVO.setChannelStatusList(statusList);
// }
//
// Iterator<MerchantChannelStatusVO> iterator = channelStatusList.iterator();
// while (iterator.hasNext()) {
// MerchantChannelStatusVO item = iterator.next();
// if (item.getMerchantCode().equals(userInfoVO.getMerchantCode())) {
// if (!mapMerchantId.containsKey(item.getChannel() + item.getMerchantId() + item.getMerchantCode())) {
// statusList.add(item);
// mapMerchantId.put(item.getChannel() + item.getMerchantId() + item.getMerchantCode(), 1);
// }
// if (Objects.equals(4, item.getChannel())) {
// if (userInfoVO.getWxMercNoD0() == null) {
// userInfoVO.setWxMercNoD0(item.getWxMercNo());
// } else {
// userInfoVO.setWxMercNoD0(userInfoVO.getWxMercNoD0() + " / " + item.getWxMercNo());
// }
//
// if (userInfoVO.getZfbMercNoD0() == null) {
// userInfoVO.setZfbMercNoD0(item.getZfbMercNo());
// } else {
// userInfoVO.setZfbMercNoD0(userInfoVO.getZfbMercNoD0() + " / " + item.getWxMercNo());
// }
// } else {
// userInfoVO.setWxMercNoD1(item.getWxMercNo());
// userInfoVO.setZfbMercNoD1(item.getZfbMercNo());
// }
//
// iterator.remove();
// }
// }
// }
//
// return pageResult;
// }
}

4
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/PromotionImageService.java
View File

@ -48,7 +48,7 @@ public class PromotionImageService {
if (i>0) {
return new RespBody("000000");
}
log.error("修改错误");
return new RespBody("000051");
log.error("增加错误");
return new RespBody("000052");
}
}

6
newadmin/common-api/pom.xml
View File

@ -39,6 +39,12 @@
<artifactId>commons-lang</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>com.alipay.sdk</groupId>
<artifactId>alipay-sdk-java</artifactId>
<version>4.38.37.ALL</version>
<scope>compile</scope>
</dependency>
</dependencies>

21
newadmin/common-api/src/main/java/com/chaozhanggui/common/system/config/ParameterConfig.java Normal file
View File

@ -0,0 +1,21 @@
package com.chaozhanggui.common.system.config;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component;
/**
* @author lyf
*/
@Data
@Configuration
@PropertySource("classpath:application-common.yml")
public class ParameterConfig {
/**
* 阿里自用型应用appid
*/
@Value("${parameter.ZY_ALI_APP_ID}")
public String ZY_ALI_APP_ID;
}

62
newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/AlipayTransfer.java Normal file
View File

@ -0,0 +1,62 @@
package com.chaozhanggui.common.system.util;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.CertAlipayRequest;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.domain.AlipayFundTransUniTransferModel;
import com.alipay.api.domain.Participant;
import com.alipay.api.request.AlipayFundTransUniTransferRequest;
import com.alipay.api.response.AlipayFundTransUniTransferResponse;
/**
* 支付宝单笔转账
* @author lyf
*/
public class AlipayTransfer {
public static String testAlipayTransfer() throws AlipayApiException {
String privateKey = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCgreXshrn3IRi7qK9Y3IXN90JRJrZzkLUkjJ42zvCPjUHlVEJ42ZsWxBUwyqXhVGs1kl8+aDEmLfDY5IimjjDWJ6MH0N1+FvHPBINenwiM0qACYioBk3eIzWbtLafokQxDY0cXQ5GZBwNz6CefAt4T6JZNFSaUw05LPDigbsIfr2jYy5uhncAd4EHkY7tpdONQ+UyqU0rOF8fZomljem/YrLukj2nUFlK040n2kvAws3xItZbH5mwpqKs07shav+xkP4LH1KmXe5nSqc6K+KQ6Y0ZRCNjvH1S0ZqdIHmoFaWxHiDAyuXmuUEdTBU/czPIH7PrfVypOaVLEmSGn7bbfAgMBAAECggEAcC3Yt5C8JvBhbyru+PBFLq4xC60mdnqSLSlLkGJcCy0I045HNk5ee798N+tTcoTYsLc3bb+aiNhMLXEogngFWo6jwOIusUhdnDW/bgFEG+U1N1THlQAa1VTqRi646qLR1/5o9LIE5bzCyVpMxzReTbH1tW1N2VCdyeMKed+6Ahn+KrefQr0IWziSWI8lQDsm/eWbrsAl3zv5srSGUfF3mJNPzsXIiviDsIefkJjBv+A/4dlg+RJMv8fBWkRPo9xv0nVwT92tEwTCKw6VwxSWzPMMjMlUbP/h26yd2EeAfsGcLzmZXG5NCNZEl+sAoQfBkSFyWM+t+RPFFZuCsbFnAQKBgQDYEE/a16Q4jx5nErxfvNklx3mWnFST6bGaA/S0QQ3gyuB+9wZnjAvrE59Y7gIR4BMcGYjBpge2OAupUmNONAQBKsF7DadgXwIV+Ih3gR1OX69sTU+i3V98gcwyG+5q5fQ+NUMQu+8goYJY4lcXrZ8+HkyikWiK5SCAFYtvCjLlgQKBgQC+YOjeAn0EeeZAtYZcGOz2RTJ3/LUTLgqmiatDLCv49jRB5zSPwiVefMi9HbaX+2c2eQ5NMXkSmMoi0ptETcxMF3kf6D8PzPekeNhwHJTScO35t4JC6HZIM4HQeQFQIbZBhUP+ujfFyGXmngZazlrHS1wqv5P054x0Y40PnYiMXwKBgQDR98gim7zzWeHpuMNnJla/6AG442Mt+sSlL4L2SOH7uixANj77EZXjdMY93c4VIPRxMj88MOT9p6lteqsWrGXX3Hz54GLvvGSChWvY9phMOaB4Vwk09Hx+uoR9jbc8GwwoCAqMkJXp2Aqb5hlM4WUHMNq4gSZfFBtpXYaK+hZMAQKBgBt1xQEI4Nl9b73TsR6lpcBb+Myf0cqDcJvW7bIRtAIEGUOMQuOdgGBhpV7J42WGqLuNuIdf5HPPQBDHygePJTGwjRMSH856pRm/KJD7PmggS+MiGhLmjvEZJNdaLNtPEYff3g/m8lZ/8lrSXl5It4VZlGDCI2hG4daD6XvgICsHAoGBAIjPTzKO2Eya07CbxhT9iONVqPFyJc2c+6ZChyPcL/b5BM0hpzEeAEX9JcQp82qGuxTlvEezXFcMK9uZNVcVlZwsARzuvz1HyHNOUj4ngV3YgYV30YPpaskr/GAZtc6Z780N1DcgVDmCqgZ37+fRo/W3dqwinrbswP3PQnFEmmFL";
CertAlipayRequest alipayConfig = new CertAlipayRequest();
alipayConfig.setPrivateKey(privateKey);
alipayConfig.setServerUrl("https://openapi.alipay.com/gateway.do");
alipayConfig.setAppId("2021003175618263");
alipayConfig.setCharset("UTF8");
alipayConfig.setSignType("RSA2");
alipayConfig.setEncryptor("");
alipayConfig.setFormat("json");
alipayConfig.setCertPath("/home/www/service/admin/appCertPublicKey_2021003175618263.crt");
alipayConfig.setAlipayPublicCertPath("/home/www/service/admin/alipayCertPublicKey_RSA2.crt");
alipayConfig.setRootCertPath("/home/www/service/admin/alipayRootCert.crt");
AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig);
AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
AlipayFundTransUniTransferModel model = new AlipayFundTransUniTransferModel();
//商家侧唯一订单号
model.setOutBizNo("1690966827");
model.setRemark("测试测测测");
model.setBusinessParams("{\"payer_show_name_use_alias\":\"true\"}");
model.setBizScene("DIRECT_TRANSFER");
//收款方信息
Participant payeeInfo = new Participant();
payeeInfo.setIdentity("15619297581");
payeeInfo.setIdentityType("ALIPAY_LOGON_ID");
payeeInfo.setName("刘一帆");
model.setPayeeInfo(payeeInfo);
model.setTransAmount("0.20");
model.setProductCode("TRANS_ACCOUNT_NO_PWD");
model.setOrderTitle("测试测测测");
request.setBizModel(model);
AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request);
System.out.println(response.getBody());
if (response.isSuccess()) {
System.out.println("调用成功");
return response.getBody();
} else {
System.out.println("调用失败");
return response.getBody();
// sdk版本是"4.38.0.ALL"及以上,可以参考下面的示例获取诊断链接
// String diagnosisUrl = DiagnosisUtils.getDiagnosisUrl(response);
// System.out.println(diagnosisUrl);
}
}
}

1
newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/ExceptionUtil.java
View File

@ -71,6 +71,7 @@ public class ExceptionUtil {
map.put("000049","用户没有创建活动的权限");
map.put("000050","用户权限不足");
map.put("000051","修改错误");
map.put("000052","增加错误");

2
newadmin/common-api/src/main/resources/application-common.yml Normal file
View File

@ -0,0 +1,2 @@
parameter:
ZY_ALI_APP_ID: 2021003175619219

3
newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussAppMenuMapper.java
View File

@ -5,6 +5,8 @@ import com.chaozhanggui.dao.system.entity.TbPlussAppMenu;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
@Mapper
public interface TbPlussAppMenuMapper {
@ -15,6 +17,7 @@ public interface TbPlussAppMenuMapper {
int insertSelective(TbPlussAppMenu record);
TbPlussAppMenu selectByPrimaryKey(Integer id);
List<TbPlussAppMenu> selectAppMenuList();
int updateByPrimaryKeySelective(TbPlussAppMenu record);

6
newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussRoleUserInfoMapper.java
View File

@ -2,9 +2,13 @@ package com.chaozhanggui.dao.system.dao;
import com.chaozhanggui.dao.system.entity.TbPlussRoleUserInfo;
import com.chaozhanggui.dao.system.entity.VO.UserInfoVO;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Component
@Mapper
public interface TbPlussRoleUserInfoMapper {
@ -19,4 +23,6 @@ public interface TbPlussRoleUserInfoMapper {
int updateByPrimaryKeySelective(TbPlussRoleUserInfo record);
int updateByPrimaryKey(TbPlussRoleUserInfo record);
List<UserInfoVO> queryUserInfoVOPage(Map<String, Object> map);
}

145
newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/UserInfoVO.java Normal file
View File

@ -0,0 +1,145 @@
package com.chaozhanggui.dao.system.entity.VO;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
* @author lyf
*/
@Data
public class UserInfoVO {
private Integer id;
private String storeId;
private String storeName;
private String userName;
private String loginName;
private String trueName;
private String provinceCode;
private String cityCode;
private String sex;
private String phone;
private String email;
private Integer status;
private Integer uiStatus;
private String roleCode;
private String parentUserType;
private Integer parentUserId;
private String parentUserName;
private String aliReason;
private String wechatReason;
private String password;
private String creator;
@DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
private Date createDt;
@DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
private Date createTime;
private String updator;
@DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
private Date updateTime;
private String version;
private Integer parentId;
private Integer areaId;
private String areaCode;
private String source;
private String roleIds;
private String organCode;
private String organName;
private String organTypeCode;
private String organTypeName;
private String userType;
private String staffType;
//推广员等级
private String level;
private Date startTime;
private Date endTime;
private String merchantCode;
private String merchantName;
private String merchantType;
private String certnum;
private String parentLoginName;
private String parentPhone;
private String inviteNum;
private String spreadFlag;
private Integer userId;
private String contactMobile;
private String alias;
private String channel;
/**
* 1 代表要查询同ip
*/
private String sameIp;
@TableField(exist = false)
private Integer condition;
/**
* 该参数为没有指定进件通道的
*/
private String thirdStatus;
/**
* @description:openid
* @date: 2021/9/23 16:20
*/
private String openId;
/**
* 随行付的通道进件状态
*/
@TableField(exist = false)
private String mcsStatus;
@TableField(exist = false)
private String ppStatus;
@TableField(exist = false)
private String ppThirdStatus;
@TableField(exist = false)
private Integer nextRegisterCount;
@TableField(exist = false)
private Integer nextCertCount;
@TableField(exist = false)
private Integer nextIncomingCount;
/**
* 是否推送微信消息0：不推送 1：推送
*/
private String isPushWxMessage;
private String typeCode;
/**
* 是否在黑名单中
*/
private Boolean isBlack;
private String merchantId;
private String wxMercNo;
private String zfbMercNo;
private String wxMercNoD1;
private String wxMercNoD0;
private String zfbMercNoD1;
private String zfbMercNoD0;
private String levelName;
}

8
newadmin/dao-api/src/main/resources/mapper/TbPlussAppMenuMapper.xml
View File

@ -34,7 +34,13 @@
from tb_pluss_app_menu
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<select id="selectAppMenuList" resultType="com.chaozhanggui.dao.system.entity.TbPlussAppMenu">
SELECT
<include refid="Base_Column_List" />
FROM tb_pluss_app_menu
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tb_pluss_app_menu
where id = #{id,jdbcType=INTEGER}
</delete>

3
newadmin/dao-api/src/main/resources/mapper/TbPlussRoleUserInfoMapper.xml
View File

@ -15,6 +15,9 @@
<include refid="Base_Column_List" />
from tb_pluss_role_user_info
where id = #{id,jdbcType=BIGINT}
</select>
<select id="queryUserInfoVOPage" resultType="com.chaozhanggui.dao.system.entity.VO.UserInfoVO">
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from tb_pluss_role_user_info