Skip to content

G
gdtel-gztel-school-center
Commit 8c9fc6a4 by 弓厶
Options

Merge remote-tracking branch 'origin/master'

parents 4635a901 af1be8c2
Showing with 911 additions and 63 deletions
apply-net/pom.xml
......@@ -14,6 +14,11 @@
<version>0.0.1</version>
<dependencies>
<dependency>
<groupId>com.winsun.framework</groupId>
<artifactId>winsun-core-message</artifactId>
<version>${winsun-framework.version}</version>
</dependency>
<!-- 为了节省内存，改用jetty -->
<dependency>
<groupId>org.springframework.boot</groupId>
......
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java 0 → 100644
package com.winsun.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.PackageUpgrade;
import com.winsun.mapper.PackageUpgradeMapper;
import com.winsun.utils.MessageUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* @Author: chancy
* @Date: 2020/2/25 11:14
*/
@Slf4j
@RestController
@RequestMapping("/packageUpgrade")
public class PackageUpgradeController extends BaseController {
private static PackageUpgradeMapper packageUpgradeMapper;
@Autowired
@Qualifier("redisStringTemplate")
private RedisTemplate redisTemplate;
@Autowired
public PackageUpgradeController(PackageUpgradeMapper packageUpgradeMapper) {
PackageUpgradeController.packageUpgradeMapper = packageUpgradeMapper;
}
@Permission(menuname = "发送验证码", value = "sendVerificationCode", method = RequestMethod.POST)
public ResponseData<String> sendVerificationCode(@RequestParam("selectOrder") String selectOrder) {
Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
if(selectOrder.contains("@")){
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder);
List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
String nbr = packageUpgrade.get(0).get("acc_nbr").toString();
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
log.info("验证码:"+s);
//MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
redisTemplate.opsForValue().set(selectOrder,s,30, TimeUnit.MINUTES);
return ResponseData.success("已发送验证码到手机："+nbr.substring(0,3)+"****"+nbr.substring(7,11));
}
if(selectOrder.length() == 18){
wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder);
List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
String nbr = packageUpgrade.get(0).get("acc_nbr").toString();
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
log.info("验证码:"+s);
//MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
redisTemplate.opsForValue().set(selectOrder,s,30, TimeUnit.MINUTES);
return ResponseData.success("已发送验证码到手机："+nbr.substring(0,3)+"****"+nbr.substring(7,11));
}
if(selectOrder.length() == 11){
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
String nbr = packageUpgrade.get(0).get("acc_nbr").toString();
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
log.info("验证码:"+s);
// MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
redisTemplate.opsForValue().set(selectOrder,s,30, TimeUnit.MINUTES);
return ResponseData.success("已发送验证码到手机："+nbr.substring(0,3)+"****"+nbr.substring(7,11));
}
return ResponseData.error("当前查询条件有误！");
}
@Permission(menuname = "查询宽带信息", value = "selectPackage", method = RequestMethod.POST)
public ResponseData<List<Map<String,Object>>> selectPackage(@RequestParam("selectOrder") String selectOrder,@RequestParam("verificationCode") String verificationCode) {
if(redisTemplate.opsForValue().get(selectOrder).toString().equals(verificationCode)){
Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
if(selectOrder.contains("@")){
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder);
List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
return ResponseData.success(packageUpgrade);
}
if(selectOrder.length() == 18){
wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder);
List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
return ResponseData.success(packageUpgrade);
}
if(selectOrder.length() == 11){
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
return ResponseData.success(packageUpgrade);
}
}
return ResponseData.error("验证码有误！");
}
}
apply-net/src/main/resources/application-dev.yml
......@@ -12,7 +12,7 @@ eureka:
serviceUrl:
defaultZone: http://eureka:20000/eureka/
server:
port: 11091
port: 11092
servlet:
context-path: /ciop
tomcat:
......
apply-net/src/main/resources/application-prod.yml
......@@ -12,7 +12,7 @@ eureka:
serviceUrl:
defaultZone: http://eureka:21000/eureka/
server:
port: 11091
port: 11092
servlet:
context-path: /ciop
tomcat:
......
apply-net/src/main/resources/application.yml
......@@ -10,7 +10,7 @@ eureka:
serviceUrl:
defaultZone: http://localhost:20000/eureka/
server:
port: 11091
port: 11092
servlet:
context-path: /ciop
tomcat:
......@@ -187,4 +187,12 @@ management:
web:
exposure:
include: bus-refresh
#发送短信账号
message:
user: "jyyy"
pwd: "ll987!!ali5c8"
url: "https://fnsms.mini189.cn/smsapi"
phoneRule:
enabled: false
rule: "133, 149, 153, 173, 177, 180, 181, 189, 191, 199"
common/src/main/java/com/winsun/bean/Order.java 0 → 100644
package com.winsun.bean;
import java.io.Serializable;
import java.sql.Date;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
/**
* 订单
*
*/
@Data
@TableName("hhr_order")
public class Order implements Serializable{
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private int id;
/**
* 订单号
*/
private String orderNumber;
/**
* 小白卡订单号id
*/
private String xbOrderId;
/**
* 订单id
*/
private String orderId;
/**
* 订单状态
*/
private String orderStatus;
/**
* 合伙人id
*/
private String hehuorenId;
/**
* 套餐id
*/
private String packageId;
/**
* 客户姓名
*/
private String customerName;
/**
* 办理号码
*/
private String businessNumber;
/**
* 联系号码
*/
private String contactNumber;
/**
* 身份证号码
*/
private String idCard;
/**
* 办理号码ICCID
*/
private String businessIccid;
/**
* 卡品
*/
private String kapin;
/**
* 身份证正面地址
*/
private String idCardz;
/**
* 身份证反面地址
*/
private String idCardf;
/**
* 手持身份证正面地址
*/
private String idCardzs;
/**
* 学生卡
*/
private String studenCard;
/**
* 创建时间
*/
private Date createTime;
/**
* 订单完成时间
*/
private Date successTime;
/**
* 地址
*/
private String address;
/**
* 备注
*/
private String remarks;
/**
* 快递公司
*/
private String company;
/**
* 快递单号
*/
private String kuaidiOrder;
/**
* 省市县
*/
private String site;
/**
* 预实名返回值
*/
private String msg;
/**
* 派送方式
*/
private String sendType;
/**
* 现有套餐
*/
private String nowPackage;
/**
* 办理套餐
*/
private String businessPackage;
/**
* 老用户id
*/
private String userId;
/**
* 老用户办理类型1:套餐更换，2：单宽进融合，3融合提速，4充值
*/
private String userBussinessType;
/**
* 用户类型（1：老客户；0新客户;2:老客户续约3：融合 4：抽奖；5：单宽；6：羊城通卡）
*/
private String userType;
/**
* 受理结果（通过/不通过）
*/
private String acceptResult;
/**
* 受理人
*/
private String acceptName;
/**
* 受理意见
*/
private String acceptComment;
/**
* 受理时间
*/
private Date acceptDate;
/**
* 提交佣金系统次数
*/
private int yjCount;
/**
* 提交佣金系统结果
*/
private String yjType;
/**
* 新用户提交方式0督导1本人
*/
private int tjType;
/**
* 小白卡1单移 2融合
*/
private int xbType;
/**
* 宽带账号
*/
private String netNumber;
/**
* 宽带密码
*/
private String netPassword;
/**
* 学校
*/
//private String userSchool;
/**
* 学生证审核状态， 0 未审核，1已审核
*/
private String studentCardCheckStatus;
/**
* 失败原因
*/
private String checkFail;
/**
* 资费
*/
private String expenses;
/**
* 办理标识
*/
private String identifying;
/**
* 宽带id
*/
private String kdOrderId;
/**
* 奖品的账号
*/
private String giftAccount;
/**
* 奖品的密码
*/
private String giftPassword;
/**
* 合伙人县分
*/
private String hehuorenArea;
/**
* 合伙人县分
*/
private String hehuorenName;
/**
*
*/
private String hehuorenSchool;
/**
*
*/
private String hehuorenPhone;
/**
*
*/
private String supervisorName;
/**
*
*/
private String lzgh;
/**
* 对应的智能平台上订单的状态
*/
private String thStatus;
/**
*
*/
private String studentNumber;
/**
* 班级
*/
private String classNumber;
/**
* 父母名字
*/
private String parentName;
}
common/src/main/java/com/winsun/bean/PackageUpgrade.java 0 → 100644
package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
import java.io.Serializable;
/**
* (PackageUpgrade)实体类
*
* @author makejava
* @since 2020-02-25 11:27:38
*/
@Data
@TableName("hhr_xyzx_yd_yrym_list")
public class PackageUpgrade implements Serializable {
/**
* 月份
*/
private Integer monthId;
/**
* 主键标识
*/
@TableId(value = "serv_id", type = IdType.AUTO)
private Double servId;
/**
* 局向
*/
private String substName;
/**
* 学校
*/
private String schoolName;
/**
* 用户类型（单宽 单移 融合）
*/
private String userType;
/**
* 是否具备提速条件
*/
private String isPreTs;
/**
* 姓名
*/
private String custName;
/**
* 身份证号码
*/
private String socialId;
/**
* 手机号码
*/
private String accNbr;
/**
* 入网时间
*/
private Object finishDate;
/**
* 网龄
*/
private Double rwDate;
/**
* 手机当前套餐
*/
private String cdmaDiscDesc;
/**
* 是否受理“YD4G03-252-1-4”
*/
private String isBltc1;
/**
* 是否受理“YD4G03-252-1-5”
*/
private String isBltc2;
/**
* 是否受理“YD4G03-268-1-1”
*/
private String isBltc3;
/**
* 用户状态
*/
private String stateDesc;
/**
* 停机时间
*/
private String stopDate;
/**
* 是否融合
*/
private String isGlkd;
/**
* T-3月出账金额
*/
private Double feeT3;
/**
* T-2月出账金额
*/
private Double feeT2;
/**
* T-1月出账金额
*/
private Double feeT1;
/**
* 近三个月平均出账金额(程序跑)
*/
private Double avgFee;
/**
* 网点编码
*/
private String channelNbr;
/**
* 网点名称
*/
private String channelName;
/**
* 代理商
*/
private String dlsName;
/**
* 移动号码本金余额
*/
private Double feeBj;
/**
* T-1月是否活跃(程序跑)
*/
private String isHyt1;
/**
* T-1月是否有效(程序跑)
*/
private String isYxt1;
/**
* T-1月开机天数
*/
private Integer kjTsT1;
/**
* T-1月流量
*/
private Double stmDataT1;
/**
* T-1月主叫时长
*/
private Double mouCallT1;
/**
* T-1月短信
*/
private Integer mgsCountsT1;
/**
* 是否受理X00022449
*/
private String isBltc4;
/**
* 受理几次X00022449
*/
private Integer bltcNum;
/**
* 宽带接入号
*/
private String accNbrKd;
/**
* 多媒体账号
*/
private String accNbr2;
/**
* 域名
*/
private String yuName;
/**
* 宽带入网时间
*/
private Object createDateKd;
/**
* 宽带号码是否活跃(亚飞提供)
*/
private String isHyKd;
/**
* 网龄(程序跑)
*/
private Double rwDateKd;
/**
* 主套餐
*/
private String kdDiscName;
/**
* 是否受理“DM0002-A01 （0元宽带标识）
*/
private String is0ykd;
/**
* 宽带速率
*/
private Integer speedValue;
/**
* 宽带体验速率
*/
private Integer speedTyValue;
/**
* 速率(宽带速率和体验速率取较大值)
*/
private Integer speedKd;
/**
* 当前用户状态
*/
private String kdStateDesc;
/**
* 停机时间
*/
private Object stopDateKd;
/**
* 宽带本金余额
*/
private Double feeBjKd;
/**
* 201812月是否活跃
*/
private String isHy1812;
/**
* 201901月是否活跃
*/
private String isHy1901;
/**
* 201902月是否活跃
*/
private String isHy1902;
/**
* 维系策略
*/
private String wxcl;
/**
* 用户可理解的手机套餐名称
*/
private String cdmaDiscDescYh;
/**
* 用户可理解的宽带套餐名称
*/
private String kdDiscNameYh;
/**
* 对用户显示套餐内容
*/
private String showDiscDesc;
/**
* 推荐用户办理的套餐内容
*/
private String recDiscDesc;
/**
* 推荐用户办理的套餐详情
*/
private String recDiscXq;
/**
* 用户确认页提示内容
*/
private String promptDec;
}
\ No newline at end of file
common/src/main/java/com/winsun/bean/Partner.java
......@@ -12,7 +12,7 @@ import java.io.Serializable;
*合伙人信息
*/
@Data
@TableName("hhr_user")
@TableName("hhr_user_view")
public class Partner implements Serializable {
/**
......@@ -57,7 +57,6 @@ public class Partner implements Serializable {
* 性别
*/
private String gender;
/**
* 县分（区域）
*/
......
common/src/main/java/com/winsun/bean/Product.java
......@@ -68,7 +68,7 @@ public class Product implements Serializable {
private String productIntroduction;
/**
* 状态0正常，1删除
* 状态0正常，1下架
*/
private String productState = "0";
......
common/src/main/java/com/winsun/constant/OrderStatus.java
......@@ -12,11 +12,14 @@ import java.util.Map;
public enum OrderStatus {
//
PENDINGSUBMISSION("1", "待提交"),
FILE("4", "归档"),
INVALID("5", "作废"),
ACCEPTANCESUCCESSFUL("3", "受理成功"),
FILE("4", "已完成"),
INVALID("5", "异常单"),
PENDINGDISTRIBUTION("6", "待配送"),
INLOGISTICSDISTRIBUTION("7", "已完成"),
SUCCESSFULDISTRIBUTION("8", "已完成"),
ACCEPTANCESUCCESSFUL("3", "已完成"),
CHARGED("9", "已收费"),
ACCEPTEXCEPTCION("10", "受理异常"),
ACCEPTEXCEPTCION("10", "异常单"),
PENDINGACCEPTANCE("2", "待受理"),
NOTPAID("100", "未支付");
OrderStatus(String id, String name) {
......
common/src/main/java/com/winsun/mapper/OrderMapper.java 0 → 100644
package com.winsun.mapper;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Component;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.bean.Order;
import com.winsun.bean.OrderView;
@Mapper
@Component
public interface OrderMapper extends BaseMapper<Order> {
@Select("<script>SELECT * FROM `hhr_order` <where> ${ew.sqlSegment} </where> </script>")
List<Map<String, Object>> downloadOrder(@Param("ew") Wrapper<Order> wrapper);
}
common/src/main/java/com/winsun/mapper/OrderViewMapper.java
......@@ -3,11 +3,10 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.bean.OrderView;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Component;
import java.sql.Timestamp;
import java.util.List;
import java.util.Map;
......@@ -21,4 +20,17 @@ public interface OrderViewMapper extends BaseMapper<OrderView> {
@Select("<script>SELECT * FROM `order_view` <where> ${ew.sqlSegment} </where> </script>")
List<Map<String, Object>> downloadOrderView(@Param("ew") Wrapper<OrderView> wrapper);
/**
* 智能平台推送接收
* @return
*/
@Update("<script>UPDATE `hhr_order` set th_status = #{status},order_status = #{orderStatus} <where> ${ew.sqlSegment} </where> </script>")
Integer IntelligentPlatformPush(@Param("ew") Wrapper<Object> wrapper,@Param("status")String status,@Param("orderStatus")String orderStatus);
@Select("<script>SELECT id FROM `hhr_order` <where> ${ew.sqlSegment} </where> </script>")
String selectOrderId(@Param("ew") Wrapper<Object> wrapper);
@Insert("insert into`hhr_order_history`(order_id, status, create_date) values(#{id}, #{status}, #{createTime})")
int insertOrderHistory(@Param("id")String id,@Param("status")String status,@Param("createTime") Timestamp createTime);
}
common/src/main/java/com/winsun/mapper/PackageUpgradeMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.PackageUpgrade;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Component;
import com.baomidou.mybatisplus.mapper.Wrapper;
import java.util.List;
import java.util.Map;
/**
* @Author: chancy
* @Date: 2020/2/25 11:31
*/
@Mapper
@Component
public interface PackageUpgradeMapper extends BaseMapper<PackageUpgrade> {
@Select("<script>SELECT * FROM `hhr_xyzx_yd_yrym_list` <where> ${ew.sqlSegment} </where> </script>")
List<Map<String,Object>> selectPackage(@Param("ew") Wrapper<PackageUpgrade> wrapper);
}
common/src/main/java/com/winsun/mapper/PartnerMapper.java
......@@ -3,9 +3,18 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.Partner;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface PartnerMapper extends BaseMapper<Partner> {
@Update("update sys_user set phone = #{phone} ,name = #{name} ,account = #{account} ,sex = #{gender} ,substName = #{area} where id=#{id}")
int updateSysUser(@Param("phone") String phone,@Param("name") String name,@Param("account") String account,@Param("gender") String gender,@Param("area") String area,@Param("id") String id);
@Update("update hhr_user set ysm = #{ysm} ,wx_id = #{wxId} ,id_card = #{idCard} ,school = #{school} where id=#{id}")
int updateHhUser(@Param("ysm") String ysm,@Param("wxId") String wxId,@Param("idCard") String idCard,@Param("school") String school,@Param("id") String id);
}
service-manager/src/main/java/com/winsun/controller/IntelligentPlatformPushController.java 0 → 100644
package com.winsun.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.bean.OrderView;
import com.winsun.constant.OrderStatus;
import com.winsun.mapper.OrderViewMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.sql.Timestamp;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/**
* @Author: chancy
* @Date: 2020/2/21 9:22
*/
@Slf4j
@RestController
@RequestMapping("/school_center")
public class IntelligentPlatformPushController {
private static OrderViewMapper orderViewMapper;
@Autowired
public IntelligentPlatformPushController(OrderViewMapper orderViewMapper) {
IntelligentPlatformPushController.orderViewMapper = orderViewMapper;
}
/**
* 智能平台推送信息接收
*
* @param sign
* @param type
* @param content
* @return dataType：
* 预付费 yff
* 单宽带 dkd
* 融合 rh
*/
@RequestMapping(value = "/IntelligentPlatformPush/{dataType}/IntelligentPlatform")
@ResponseBody
public Map<String, Object> IntelligentPlatform(String sign, String type, String content) {
Map<String, Object> signMap = (Map<String, Object>) JSON.parse(content);
Map<String, Object> resultMap = new HashMap<>();
if (StringUtils.isEmpty(type)) {
log.info("业务类型不能为空---" + type + "---" + sign + "----" + content);
resultMap.put("code", "12001");
resultMap.put("msg", "业务类型不能为空");
return resultMap;
}
if (StringUtils.isEmpty(sign)) {
log.info("sign不能为空---" + type + "---" + sign + "----" + content);
resultMap.put("code", "12001");
resultMap.put("msg", "sign不能为空");
return resultMap;
}
if (signMap.get("orderNum") != null && StringUtils.isNotBlank(signMap.get("orderNum").toString())) {
Wrapper<Object> wrapper = new EntityWrapper<>();
wrapper.eq("order_id", signMap.get("orderNum"));
String status = signMap.get("status").toString();
String orderStatus = null;
try {
orderStatus = OrderStatus.findById(signMap.get("statusId").toString()).getName();
} catch (Exception e) {
resultMap.put("code", "12001");
resultMap.put("msg", "订单状态不存在");
log.error(e.getMessage(), e);
return resultMap;
}
Integer num = orderViewMapper.IntelligentPlatformPush(wrapper, status, orderStatus);
if (num > 0) {
if (type.equals("dkd") || type.equals("rh")) {
Wrapper<OrderView> wrapper1 = new EntityWrapper<>();
wrapper1.eq("orderSeqTHD", signMap.get("orderNum"));
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("status", signMap.get("statusId"));
try {
orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
log.info("更新成功！！！");
resultMap.put("code", "000001");
resultMap.put("msg", "消息接收成功");
} else {
log.info("更新失败");
resultMap.put("code", "00001");
resultMap.put("msg", "消息接收成功更新失败");
}
String id = orderViewMapper.selectOrderId(wrapper);
Date date = new Date();
Timestamp createTime = new Timestamp(date.getTime());
try {
orderViewMapper.insertOrderHistory(id, status, createTime);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
return resultMap;
} else {
log.info("更新失败");
resultMap.put("code", "12001");
resultMap.put("msg", "智能平台订单号不能为空");
}
return resultMap;
}
}
service-manager/src/main/java/com/winsun/controller/OrderViewController.java
......@@ -10,7 +10,6 @@ import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.OrderView;
import com.winsun.bean.UniversityInfo;
import com.winsun.constant.OrderStatus;
import com.winsun.mapper.OrderViewMapper;
import lombok.extern.slf4j.Slf4j;
......@@ -167,6 +166,7 @@ public class OrderViewController extends BaseController {
sheet.setColumnWidth(2, 6500);
sheet.setColumnWidth(5, 7000);
sheet.setColumnWidth(8, 4000);
sheet.setColumnWidth(10, 6500);
sheet.setColumnWidth(11, 6500);
sheet.setColumnWidth(14, 6500);
sheet.setColumnWidth(15, 7000);
......
service-manager/src/main/java/com/winsun/controller/PartnerController.java
......@@ -35,69 +35,31 @@ public class PartnerController extends BaseController {
private static PartnerMapper partnerMapper;
@Autowired
public PartnerController(PartnerMapper partnerMapper) {
PartnerController.partnerMapper = partnerMapper;
}
@Permission(menuname = "添加合伙人信息", value = "insert", method = RequestMethod.POST)
public ResponseData<String> insertPartner(@RequestParam("partner") String partner) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Partner sale = JSON.parseObject(partner, Partner.class);
partnerMapper.insert(sale);
return ResponseData.success("添加完毕！");
}
@Permission(menuname = "删除合伙人信息", value = "delete", method = RequestMethod.POST)
public ResponseData<String> deletePartner(@RequestParam("id") String id) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
partnerMapper.deleteById(id);
return ResponseData.success("删除完毕！");
}
@Permission(menuname = "修改合伙人信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updatePartner(@RequestParam("partner") String partner) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
public ResponseData<String> updatePartner(@RequestParam("id") String id,@RequestParam("phoneNum") String phoneNum, @RequestParam("school") String school
, @RequestParam("name") String name, @RequestParam("account") String account, @RequestParam("idCard") String idCard, @RequestParam("ysm") String ysm
, @RequestParam("gender") String gender, @RequestParam("area") String area, @RequestParam("wxId") String wxId) {
int updateSysUse = partnerMapper.updateSysUser(phoneNum, name, account, gender, area, id);
int updateHhUser = partnerMapper.updateHhUser(ysm,wxId,idCard,school,id);
if (updateSysUse==1&&updateHhUser==1){
return ResponseData.success("修改完毕！");
}
Partner sale = JSON.parseObject(partner, Partner.class);
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", sale.getId());
/**
* 待定............................
*/
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("phoneNum", "");
partnerMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
return ResponseData.success("修改完毕！");
return ResponseData.error("修改失败");
}
@Permission(menuname = "查询合伙人信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<Partner>> listPartner(@RequestParam("phoneNum") String phoneNum, @RequestParam("status") String status,
@RequestParam("school") String school, @RequestParam("account") String account,
@RequestParam("name") String name, @RequestParam("gender") String gender, @RequestParam("area") String area,
@RequestParam("grade") String grade,
@RequestParam(name = "pageIndex", required = false) int pageIndex, @RequestParam(name = "pageSize", required = false) int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
public ResponseData<Page<Partner>> listPartner(@RequestParam("school") String school, @RequestParam("name") String name, @RequestParam("area") String area,
@RequestParam(name = "pageNo", required = false) int pageIndex, @RequestParam(name = "pageSize", required = false) int pageSize) {
Wrapper<Partner> wrapper = new EntityWrapper();
wrapper.like(StringUtils.isNotBlank(phoneNum), "phone_num", phoneNum, SqlLike.LEFT);
wrapper.like(StringUtils.isNotBlank(school), "school", school, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(account), "account", account, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(status), "status", Integer.parseInt(status));
wrapper.eq(StringUtils.isNotBlank(grade), "grade", grade);
wrapper.eq(StringUtils.isNotBlank(area), "area", area);
wrapper.eq(StringUtils.isNotBlank(gender), "gender", gender);
Page<Partner> page = new Page<>(pageIndex, pageSize);
List<Partner> salespeople = partnerMapper.selectPage(page, wrapper);
page.setRecords(salespeople);
......
service-manager/src/main/java/com/winsun/controller/YsmUserController.java
......@@ -119,4 +119,11 @@ public class YsmUserController extends BaseController {
page.setRecords(ysmUsers);
return ResponseData.success(page, "查询成功！");
}
@Permission(menuname = "查询", value = "getlist", method = RequestMethod.POST)
public ResponseData<List<Map<String,Object>>> getlistYsmUser() {
Wrapper<YsmUser> wrapper = new EntityWrapper();
wrapper.setSqlSelect("id,user_name as userName");
return ResponseData.success(ysmUserMapper.selectMaps(wrapper), "查询成功！");
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment