Skip to content

G
gdtel-gztel-school-center
Commit ac2ff027 by 弓厶
Options

Merge remote-tracking branch 'origin/master'

parents 3cecf7e0 ecd88f6c
Showing with 320 additions and 152 deletions
apply-net/src/main/java/com/winsun/controller/ImgController.java 0 → 100644
package com.winsun.controller;
import com.winsun.constant.FilePath;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
/**
* @Author xuede
* @Date 2020/3/6 16:44
* @Version 1.0
*/
@Slf4j
@RestController
public class ImgController {
//menuname = "图片路径" 只支持jpeg 和 png
@RequestMapping( value = "/images/**",produces ={MediaType.IMAGE_JPEG_VALUE,MediaType.IMAGE_PNG_VALUE} )
public byte[] getbackground(HttpServletRequest request) {
byte[] bytes=new byte[10];
request.getServletPath();
String imgurl= FilePath.BACKGROUNDIMG.getValue()+"/"+request.getServletPath();
imgurl = imgurl.replace("//", "/");
File file = new File(imgurl);
FileInputStream inputStream = null;
try {
inputStream = new FileInputStream(file);
} catch (FileNotFoundException e) {
e.printStackTrace();
}
try {
bytes = new byte[inputStream.available()];
} catch (IOException e) {
e.printStackTrace();
}
try {
inputStream.read(bytes, 0, inputStream.available());
} catch (IOException e) {
e.printStackTrace();
}
return bytes;
}
}
common/src/main/java/com/winsun/constant/FilePath.java
...@@ -11,8 +11,8 @@ import java.util.Map; ...@@ -11,8 +11,8 @@ import java.util.Map;
*/ */
public enum FilePath { public enum FilePath {
// //
BACKGROUNDIMG("套餐背景图片基础路径","BackgroundImg"), BACKGROUNDIMG("套餐背景图片基础路径","enclosure"),
IDCARD("身份证明","packageNewClothes/images/idCard/"); IDCARD("身份证明","enclosure/images/idCard/");
FilePath(String id, String value) { FilePath(String id, String value) {
this.id = id; this.id = id;
this.value = value; this.value = value;
......
common/src/main/java/com/winsun/mapper/AppMapper.java
...@@ -24,8 +24,8 @@ public interface AppMapper extends BaseMapper<PackageUpgrade> { ...@@ -24,8 +24,8 @@ public interface AppMapper extends BaseMapper<PackageUpgrade> {
@Select("<script>SELECT * FROM `hhr_xyzx_yd_yrym_list` <where> ${ew.sqlSegment} </where> </script>") @Select("<script>SELECT * FROM `hhr_xyzx_yd_yrym_list` <where> ${ew.sqlSegment} </where> </script>")
List<Map<String,Object>> selectPackage(@Param("ew") Wrapper<PackageUpgrade> wrapper); List<Map<String,Object>> selectPackage(@Param("ew") Wrapper<PackageUpgrade> wrapper);
@Insert("insert into `hhr_order_history` values(#{id},#{status},#{date}) ") @Insert("insert into `hhr_order_history` values(#{id},#{status},#{date},#{operator}) ")
Integer inserOrderHis(@Param("id")String id, @Param("status")String status, @Param("date")Date date); Integer inserOrderHis(@Param("id")String id, @Param("status")String status, @Param("date")Date date, @Param("operator")String operator);
@Select("select * from `hhr_order_history` where order_id = #{oredrId}") @Select("select * from `hhr_order_history` where order_id = #{oredrId}")
List<Map<String,Object>> selectOrderHis(String oredrId); List<Map<String,Object>> selectOrderHis(String oredrId);
......
common/src/main/java/com/winsun/mapper/OrderMapper.java
...@@ -19,4 +19,7 @@ public interface OrderMapper extends BaseMapper<Order> { ...@@ -19,4 +19,7 @@ public interface OrderMapper extends BaseMapper<Order> {
@Select("<script>SELECT * FROM `hhr_order` <where> ${ew.sqlSegment} </where> </script>") @Select("<script>SELECT * FROM `hhr_order` <where> ${ew.sqlSegment} </where> </script>")
List<Map<String, Object>> downloadOrder(@Param("ew") Wrapper<Order> wrapper); List<Map<String, Object>> downloadOrder(@Param("ew") Wrapper<Order> wrapper);
@Select("select * from `hhr_order_history` where order_id = #{oredrId}")
List<Map<String,Object>> selectOrderHis(String oredrId);
} }
apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java → new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -78,6 +78,7 @@ public class PackageNewClothes { ...@@ -78,6 +78,7 @@ public class PackageNewClothes {
* *
* @param cardId 套餐ID * @param cardId 套餐ID
* @param partner 用户ID * @param partner 用户ID
* @param contNumber 套餐ID
* @return * @return
*/ */
@RequestMapping(value = "getNumber", method = RequestMethod.POST) @RequestMapping(value = "getNumber", method = RequestMethod.POST)
...@@ -101,7 +102,7 @@ public class PackageNewClothes { ...@@ -101,7 +102,7 @@ public class PackageNewClothes {
/** /**
* 查询套餐详情 * 查询套餐详情
* *
* @param packageId * @param packageId 套餐ID
* @return * @return
*/ */
@RequestMapping(value = "selectPackageInfo", method = RequestMethod.POST) @RequestMapping(value = "selectPackageInfo", method = RequestMethod.POST)
...@@ -215,7 +216,7 @@ public class PackageNewClothes { ...@@ -215,7 +216,7 @@ public class PackageNewClothes {
// MessageUtil.sent(contactNumber,"4",""); // MessageUtil.sent(contactNumber,"4","");
if (insert == 1) { if (insert == 1) {
appMapper.inserOrderHis(id, "资料已提交", date); appMapper.inserOrderHis(id, "资料已提交", date,sysUser.getName());
return ResponseData.success(id); return ResponseData.success(id);
} }
return ResponseData.error("开卡失败！"); return ResponseData.error("开卡失败！");
...@@ -333,7 +334,7 @@ public class PackageNewClothes { ...@@ -333,7 +334,7 @@ public class PackageNewClothes {
// MessageUtil.sent(contactNumber,"4",""); // MessageUtil.sent(contactNumber,"4","");
if (insert == 1) { if (insert == 1) {
appMapper.inserOrderHis(id, "资料已提交", date); appMapper.inserOrderHis(id, "资料已提交", date,sysUser.getName());
return ResponseData.success(id); return ResponseData.success(id);
} }
return ResponseData.error("开卡失败！"); return ResponseData.error("开卡失败！");
...@@ -467,7 +468,7 @@ public class PackageNewClothes { ...@@ -467,7 +468,7 @@ public class PackageNewClothes {
// MessageUtil.sent(contactNumber,"4",""); // MessageUtil.sent(contactNumber,"4","");
if (insert == 1) { if (insert == 1) {
appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date); appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date,sysUser.getName());
return ResponseData.success(id); return ResponseData.success(id);
} }
return ResponseData.error("开卡失败！"); return ResponseData.error("开卡失败！");
......
old-user/src/main/java/com/winsun/controller/ChooseController.java 0 → 100644
package com.winsun.controller;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Order;
import com.winsun.bean.School;
import com.winsun.bean.SysUser;
import com.winsun.mapper.*;
import lombok.extern.slf4j.Slf4j;
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.HashMap;
import java.util.List;
import java.util.Map;
/**
* 首页同用接口
*
* @Author: chancy
* @Date: 2020/3/9 10:16
*/
@Slf4j
@RestController
@RequestMapping("/choose")
public class ChooseController {
private static AppMapper appMapper;
private static PackageMapper packageMapper;
private static SchoolMapper schoolMapper;
private static OrderMapper orderMapper;
private static SysUserMapper userMapper;
@Autowired
@Qualifier("redisStringTemplate")
private RedisTemplate redisTemplate;
@Autowired
public ChooseController(AppMapper appMapper, PackageMapper packageMapper,SchoolMapper schoolMapper, OrderMapper orderMapper
, SysUserMapper userMapper) {
ChooseController.appMapper = appMapper;
ChooseController.packageMapper = packageMapper;
ChooseController.schoolMapper = schoolMapper;
ChooseController.orderMapper = orderMapper;
ChooseController.userMapper = userMapper;
}
/**
* 查询订单详情
*/
@RequestMapping(value = "selectOrderInfo", method = RequestMethod.POST)
public ResponseData<Order> selectOrderInfo(@RequestParam("orderId") String orderId) {
Order order = orderMapper.selectById(orderId);
order.setIdCard("");
order.setGiftAccount("");
order.setGiftPassword("");
return ResponseData.success(order);
}
/**
* 查询用户详情
*/
@RequestMapping(value = "selectUserInfo", method = RequestMethod.POST)
public ResponseData<Map<String, Object>> selectUserInfo(@RequestParam("partner") String partner) {
SysUser sysUser = userMapper.selectById(partner);
String schoolId = appMapper.selectSchoolId(partner);
String schoolName = appMapper.selectSchoolById(schoolId);
Map<String, Object> map = new HashMap<>();
map.put("schoolName", schoolName);
map.put("substName", sysUser.getSubstName());
map.put("name", sysUser.getName());
map.put("id", sysUser.getId());
map.put("account", sysUser.getAccount());
map.put("phone", sysUser.getPhone());
return ResponseData.success(map);
}
/**
* 查询订单历史状态
*/
@RequestMapping(value = "selectOrderHis", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam("orderId") String orderId) {
List<Map<String, Object>> list = appMapper.selectOrderHis(orderId);
return ResponseData.success(list);
}
/**
* 查询学校信息
*/
@RequestMapping(value = "selectSchoolInfo", method = RequestMethod.POST)
public ResponseData<School> selectSchoolInfo(@RequestParam("partner") String partner) {
String schoolId = appMapper.selectSchoolId(partner);
School school = schoolMapper.selectById(schoolId);
return ResponseData.success(school);
}
}
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java → old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; ...@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.base.controller.BaseController; import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.SysUser;
import com.winsun.bean.Order;
import com.winsun.bean.Package; import com.winsun.bean.Package;
import com.winsun.bean.PackageUpgrade; import com.winsun.bean.*;
import com.winsun.bean.YangChengTong;
import com.winsun.constant.OrderStatus; import com.winsun.constant.OrderStatus;
import com.winsun.constant.UserType; import com.winsun.constant.UserType;
import com.winsun.mapper.*; import com.winsun.mapper.*;
...@@ -23,7 +20,10 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -23,7 +20,10 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
...@@ -249,7 +249,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -249,7 +249,7 @@ public class PackageUpgradeController extends BaseController {
order.setHehuorenSchool(schoolName); order.setHehuorenSchool(schoolName);
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
Integer insert = orderMapper.insert(order); Integer insert = orderMapper.insert(order);
appMapper.inserOrderHis(id, "下单成功", date); appMapper.inserOrderHis(id, "下单成功", date,sysUser.getName());
// MessageUtil.sent(contactNumber,"4",""); // MessageUtil.sent(contactNumber,"4","");
if (StringUtils.isNotBlank(mark)) { if (StringUtils.isNotBlank(mark)) {
String id1 = UUID.randomUUID().toString(); String id1 = UUID.randomUUID().toString();
...@@ -268,7 +268,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -268,7 +268,7 @@ public class PackageUpgradeController extends BaseController {
yangChengTong.setContactPhone(contactNumber); yangChengTong.setContactPhone(contactNumber);
yangChengTong.setCustomerPhone(businessNumber); yangChengTong.setCustomerPhone(businessNumber);
insert += yangChengTongrMapper.insert(yangChengTong); insert += yangChengTongrMapper.insert(yangChengTong);
appMapper.inserOrderHis(id1, "下单成功", date); appMapper.inserOrderHis(id1, "下单成功", date,sysUser.getName());
return ResponseData.success(id + ":" + id1, "下单成功！"); return ResponseData.success(id + ":" + id1, "下单成功！");
} }
if (insert == 1) { if (insert == 1) {
...@@ -277,44 +277,6 @@ public class PackageUpgradeController extends BaseController { ...@@ -277,44 +277,6 @@ public class PackageUpgradeController extends BaseController {
return ResponseData.error("升级失败！"); return ResponseData.error("升级失败！");
} }
/**
* 查询订单详情
*/
@RequestMapping(value = "selectOrderInfo", method = RequestMethod.POST)
public ResponseData<Order> selectOrderInfo(@RequestParam("orderId") String orderId) {
Order order = orderMapper.selectById(orderId);
order.setIdCard("");
order.setGiftAccount("");
order.setGiftPassword("");
return ResponseData.success(order);
}
/**
* 查询用户详情
*/
@RequestMapping(value = "selectUserInfo", method = RequestMethod.POST)
public ResponseData<Map<String, Object>> selectUserInfo(@RequestParam("partner") String partner) {
SysUser sysUser = userMapper.selectById(partner);
String schoolId = appMapper.selectSchoolId(partner);
String schoolName = appMapper.selectSchoolById(schoolId);
Map<String, Object> map = new HashMap<>();
map.put("schoolName", schoolName);
map.put("substName", sysUser.getSubstName());
map.put("name", sysUser.getName());
map.put("id", sysUser.getId());
map.put("account", sysUser.getAccount());
map.put("phone", sysUser.getPhone());
return ResponseData.success(map);
}
/**
* 查询订单历史状态
*/
@RequestMapping(value = "selectOrderHis", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam("orderId") String orderId) {
List<Map<String, Object>> list = appMapper.selectOrderHis(orderId);
return ResponseData.success(list);
}
} }
service-manager/src/main/java/com/winsun/controller/ImgController.java 0 → 100644
package com.winsun.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.sun.org.apache.regexp.internal.RE;
import com.winsun.bean.Package;
import com.winsun.constant.FilePath;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.HttpRequest;
import org.springframework.http.MediaType;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* @Author xuede
* @Date 2020/3/6 16:44
* @Version 1.0
*/
@Slf4j
@RestController
public class ImgController {
//menuname = "图片路径" 只支持jpeg 和 png
@RequestMapping( value = "/images/**",produces ={MediaType.IMAGE_JPEG_VALUE,MediaType.IMAGE_PNG_VALUE} )
public byte[] getbackground(HttpServletRequest request) {
byte[] bytes={};
request.getServletPath();
String imgurl= FilePath.BACKGROUNDIMG.getValue()+"/"+request.getServletPath();
imgurl = imgurl.replace("//", "/");
File file = new File(imgurl);
FileInputStream inputStream = null;
try {
inputStream = new FileInputStream(file);
} catch (FileNotFoundException e) {
e.printStackTrace();
}
bytes = new byte[0];
try {
bytes = new byte[inputStream.available()];
} catch (IOException e) {
e.printStackTrace();
}
try {
inputStream.read(bytes, 0, inputStream.available());
} catch (IOException e) {
e.printStackTrace();
}
return bytes;
}
}
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -49,7 +49,15 @@ public class OrderController extends BaseController { ...@@ -49,7 +49,15 @@ public class OrderController extends BaseController {
public OrderController(OrderMapper orderMapper) { public OrderController(OrderMapper orderMapper) {
OrderController.orderMapper = orderMapper; OrderController.orderMapper = orderMapper;
} }
/**
* 查询订单历史状态
*/
@RequestMapping(value = "selectOrderHis", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam("orderId") String orderId) {
List<Map<String, Object>> list = orderMapper.selectOrderHis(orderId);
return ResponseData.success(list);
}
/** /**
* *
...@@ -66,7 +74,6 @@ public class OrderController extends BaseController { ...@@ -66,7 +74,6 @@ public class OrderController extends BaseController {
* @param hehuorenName 合伙人姓名 * @param hehuorenName 合伙人姓名
* @param orderStatus 订单状态 * @param orderStatus 订单状态
* @param customerName 客户姓名 * @param customerName 客户姓名
* @param pageIndex
* @param pageSize * @param pageSize
* @return * @return
*/ */
...@@ -98,8 +105,9 @@ public class OrderController extends BaseController { ...@@ -98,8 +105,9 @@ public class OrderController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber); wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool); wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName,SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName,SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus); if (StringUtils.isNotBlank(orderStatus)) {
wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", OrderStatus.findById(orderStatus).getName());
}
Page<Order> page = new Page<>(pageNo, pageSize); Page<Order> page = new Page<>(pageNo, pageSize);
List<Order> aPackage = orderMapper.selectPage(page, wrapper); List<Order> aPackage = orderMapper.selectPage(page, wrapper);
page.setRecords(aPackage); page.setRecords(aPackage);
...@@ -139,9 +147,11 @@ public class OrderController extends BaseController { ...@@ -139,9 +147,11 @@ public class OrderController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber); wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool); wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName,SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName,SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(orderStatus), "status", orderStatus); // wrapper.eq(StringUtils.isNotBlank(orderStatus), "status", orderStatus);
if (StringUtils.isNotBlank(orderStatus)) {
List<Map<String, Object>> Orders = orderMapper.downloadOrder(wrapper); wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", OrderStatus.findById(orderStatus).getName());
}
List<Map<String, Object>> orders = orderMapper.downloadOrder(wrapper);
List<String> tops = new ArrayList<>(); List<String> tops = new ArrayList<>();
tops.add("客户姓名"); tops.add("客户姓名");
tops.add("订单编号"); tops.add("订单编号");
...@@ -180,15 +190,18 @@ public class OrderController extends BaseController { ...@@ -180,15 +190,18 @@ public class OrderController extends BaseController {
//添加表头 //添加表头
final XSSFRow row = sheet.createRow(0); final XSSFRow row = sheet.createRow(0);
//设置列宽度 //设置列宽度
sheet.setColumnWidth(1, 6500); sheet.setColumnWidth(1, 5000);
sheet.setColumnWidth(2, 6500); sheet.setColumnWidth(2, 4000);
sheet.setColumnWidth(5, 7000); sheet.setColumnWidth(3, 4000);
sheet.setColumnWidth(8, 4000); sheet.setColumnWidth(4, 4000);
sheet.setColumnWidth(11, 6500); sheet.setColumnWidth(5, 3500);
sheet.setColumnWidth(14, 6500); sheet.setColumnWidth(6, 6000);
sheet.setColumnWidth(15, 7000); sheet.setColumnWidth(7, 4000);
sheet.setColumnWidth(17, 7500); sheet.setColumnWidth(8, 3000);
sheet.setColumnWidth(18, 600); sheet.setColumnWidth(9, 3000);
sheet.setColumnWidth(10, 3000);
sheet.setColumnWidth(11, 3000);
sheet.setColumnWidth(12, 4000);
//第一行字段名称 //第一行字段名称
tops.forEach(column -> { tops.forEach(column -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0)); XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
...@@ -196,7 +209,7 @@ public class OrderController extends BaseController { ...@@ -196,7 +209,7 @@ public class OrderController extends BaseController {
}); });
//数据 //数据
int rowIndex = row.getRowNum(); int rowIndex = row.getRowNum();
for (Map<String, Object> maps: Orders) { for (Map<String, Object> maps: orders) {
final XSSFRow rowdata = sheet.createRow(++rowIndex); final XSSFRow rowdata = sheet.createRow(++rowIndex);
for (String column : columns) { for (String column : columns) {
XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0)); XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0));
......
service-manager/src/main/java/com/winsun/controller/PackageController.java
...@@ -88,6 +88,12 @@ public class PackageController extends BaseController { ...@@ -88,6 +88,12 @@ public class PackageController extends BaseController {
aPackage.setExplains(explains); aPackage.setExplains(explains);
Integer insert = packageMapper.insert(aPackage); Integer insert = packageMapper.insert(aPackage);
if (insert==1){ if (insert==1){
EntityWrapper<Package> packagewrapper = new EntityWrapper<>();
packagewrapper.eq("id",aPackage.getId());
String backgroundpath= DEFAULTPATH+ aPackage.getId()+"/"+FILENAME;
String logopath = DEFAULTPATH+ aPackage.getId()+"/"+XIAOTUFILENAME;
packageMapper.updateForSet("adv_img ='"+backgroundpath+"' , logo= '" +logopath+"'" ,packagewrapper);
log.info("套餐信息新增完毕,id: {}",aPackage.getId()); log.info("套餐信息新增完毕,id: {}",aPackage.getId());
return ResponseData.success("新增完毕！"); return ResponseData.success("新增完毕！");
} }
...@@ -224,75 +230,5 @@ public class PackageController extends BaseController { ...@@ -224,75 +230,5 @@ public class PackageController extends BaseController {
} }
//menuname = "展示背景图"
@RequestMapping( value = "getbackground/{id}",produces = MediaType.IMAGE_JPEG_VALUE)
public byte[] getbackground(@PathVariable(value = "id") String id) {
byte[] bytes={};
if (!StringUtils.isBlank(id)){
EntityWrapper<Package> packagewrapper = new EntityWrapper<>();
packagewrapper.eq("id", id);
packagewrapper.setSqlSelect("adv_img as imgurl");
List<Map<String, Object>> selectMaps = packageMapper.selectMaps(packagewrapper);
if (!CollectionUtils.isEmpty(selectMaps)){
String imgurl = selectMaps.get(0).get("imgurl").toString();
imgurl=FilePath.BACKGROUNDIMG.getValue()+"/"+imgurl;
File file = new File(imgurl);
FileInputStream inputStream = null;
try {
inputStream = new FileInputStream(file);
} catch (FileNotFoundException e) {
e.printStackTrace();
}
bytes = new byte[0];
try {
bytes = new byte[inputStream.available()];
} catch (IOException e) {
e.printStackTrace();
}
try {
inputStream.read(bytes, 0, inputStream.available());
} catch (IOException e) {
e.printStackTrace();
}
return bytes;
}
}
return bytes;
}
//menuname = "展示小图"
@RequestMapping( value = "getxiaotu/{id}",produces = MediaType.IMAGE_JPEG_VALUE)
public byte[] getxiaotu(@PathVariable(value = "id") String id) {
byte[] bytes={};
if (!StringUtils.isBlank(id)){
EntityWrapper<Package> packagewrapper = new EntityWrapper<>();
packagewrapper.eq("id", id);
packagewrapper.setSqlSelect("logo as imgurl");
List<Map<String, Object>> selectMaps = packageMapper.selectMaps(packagewrapper);
if (!CollectionUtils.isEmpty(selectMaps)){
String imgurl = selectMaps.get(0).get("imgurl").toString();
imgurl=FilePath.BACKGROUNDIMG.getValue()+"/"+imgurl;
File file = new File(imgurl);
FileInputStream inputStream = null;
try {
inputStream = new FileInputStream(file);
} catch (FileNotFoundException e) {
e.printStackTrace();
}
bytes = new byte[0];
try {
bytes = new byte[inputStream.available()];
} catch (IOException e) {
e.printStackTrace();
}
try {
inputStream.read(bytes, 0, inputStream.available());
} catch (IOException e) {
e.printStackTrace();
}
return bytes;
}
}
return bytes;
}
} }
service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
...@@ -12,10 +12,12 @@ import com.winsun.bean.Package; ...@@ -12,10 +12,12 @@ import com.winsun.bean.Package;
import com.winsun.bean.Product; import com.winsun.bean.Product;
import com.winsun.bean.School; import com.winsun.bean.School;
import com.winsun.bean.SchoolPackage; import com.winsun.bean.SchoolPackage;
import com.winsun.constant.FilePath;
import com.winsun.mapper.PackageMapper; import com.winsun.mapper.PackageMapper;
import com.winsun.mapper.ProductMapper; import com.winsun.mapper.ProductMapper;
import com.winsun.mapper.SchoolMapper; import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SchoolPackageMapper; import com.winsun.mapper.SchoolPackageMapper;
import com.winsun.utils.FileUtil;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -26,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -26,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
...@@ -50,6 +53,12 @@ public class SchoolManagementController extends BaseController { ...@@ -50,6 +53,12 @@ public class SchoolManagementController extends BaseController {
private static ProductMapper productMapper; private static ProductMapper productMapper;
//默认路径
private static String DEFAULTPATH="images/schoolPartner/";
private static String FILENAME=".jpg";
@Autowired @Autowired
public SchoolManagementController(SchoolMapper schoolMapper, SchoolPackageMapper schoolPackageMapper,PackageMapper packageMapper,ProductMapper productMapper) { public SchoolManagementController(SchoolMapper schoolMapper, SchoolPackageMapper schoolPackageMapper,PackageMapper packageMapper,ProductMapper productMapper) {
SchoolManagementController.schoolMapper = schoolMapper; SchoolManagementController.schoolMapper = schoolMapper;
...@@ -93,6 +102,11 @@ public class SchoolManagementController extends BaseController { ...@@ -93,6 +102,11 @@ public class SchoolManagementController extends BaseController {
} }
} }
if (insert==1){ if (insert==1){
EntityWrapper<School> schoolwrapper = new EntityWrapper<>();
schoolwrapper.eq("id",school.getId());
String backgroundpath= "/"+DEFAULTPATH+ school.getId()+FILENAME;
schoolMapper.updateForSet("service_qrcode ='"+backgroundpath+"'",schoolwrapper);
log.info("学校信息新增完毕,id: {}",school.getId());
return ResponseData.success("添加成功！"); return ResponseData.success("添加成功！");
} }
return ResponseData.error("添加失败！"); return ResponseData.error("添加失败！");
...@@ -219,4 +233,24 @@ public class SchoolManagementController extends BaseController { ...@@ -219,4 +233,24 @@ public class SchoolManagementController extends BaseController {
hashMap.put("choosepages",arrayList); hashMap.put("choosepages",arrayList);
return ResponseData.success(hashMap, "查询完毕！"); return ResponseData.success(hashMap, "查询完毕！");
} }
@Permission(menuname = "上传二维码", value = "qrcodeUpload", method = RequestMethod.POST)
public ResponseData<String>xiaotuUpload(@RequestParam(value = "file") MultipartFile file, @RequestParam(value = "id",required = false) String id) {
String backgroundpath= FilePath.BACKGROUNDIMG.getValue()+"/"+DEFAULTPATH+"/";
if (StringUtils.isBlank(id)){
EntityWrapper<School> packagewrapper = new EntityWrapper<>();
packagewrapper.setSqlSelect("max(id) as id");
List<Map<String, Object>> selectMaps = schoolMapper.selectMaps(packagewrapper);
id = selectMaps.get(0).get("id").toString();
id = Integer.valueOf(Integer.valueOf(id)+1).toString();
}
boolean makefile = FileUtil.makefile(backgroundpath, file,id+FILENAME);
if (!makefile){
return ResponseData.error("上传失败！");
}
return ResponseData.success("上传成功" );
}
} }
task/src/main/java/com/winsun/TimingTask/OrderTask.java
/*
package com.winsun.TimingTask; package com.winsun.TimingTask;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
...@@ -36,35 +36,37 @@ public class OrderTask { ...@@ -36,35 +36,37 @@ public class OrderTask {
} }
//@Scheduled(cron = "0 15 10 * * ? ") @Scheduled(cron = "0 15 10 * * ? ")
@Scheduled(cron = "0/5 * * * * ? ") //@Scheduled(cron = "0/5 * * * * ? ")
//@Scheduled(fixedRate=1000*60) //@Scheduled(fixedRate=1000*60)
@PostMapping("/orderTask") @PostMapping("/orderTask")
public void general() throws ParseException { public void general() throws ParseException {
Wrapper<Order> wrapper = new EntityWrapper(); Wrapper<Order> wrapper = new EntityWrapper();
wrapper.eq("order_status", "待识别1"); wrapper.eq("order_status", "待识别");
List<Order> orders = orderMapper.selectList(wrapper); List<Order> orders = orderMapper.selectList(wrapper);
orders.forEach(order -> { orders.forEach(order -> {
try { try {
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId()); JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
log.info(jsonObject.toJSONString());
String dataArray = jsonObject.getString("dataArray"); String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class); Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class);
if(Map.get("orderStatus").toString().equals("3") || Map.get("orderStatus").toString().equals("13") || if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13") ||
Map.get("orderStatus").toString().equals("8") || Map.get("orderStatus").toString().equals("22") || Map.get("orderState").toString().equals("8") || Map.get("orderState").toString().equals("22") ||
Map.get("orderStatus").toString().equals("21") ){ Map.get("orderState").toString().equals("21") ){
Wrapper<Order> wrapper1 = new EntityWrapper(); Wrapper<Order> wrapper1 = new EntityWrapper();
wrapper1.eq("xb_order_id",Map.get("orderCode")); wrapper1.eq("xb_order_id",Map.get("orderCode"));
wrapper1.eq("id",order.getId()); wrapper1.eq("id",order.getId());
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "待处理"); dataMapping.put("order_status", "待处理");
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
log.info(order.getXbOrderId()+"订单已更新");
} }
} catch (Exception e) { } catch (Exception e) {
log.info(order.getXbOrderId()+"订单更新失败",e.getMessage()); log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
} }
}); });
/* Wrapper<Order> wrapper2 = new EntityWrapper(); Wrapper<Order> wrapper2 = new EntityWrapper();
wrapper2.eq("order_status", "待活体"); wrapper2.eq("order_status", "待活体");
List<Order> orders1 = orderMapper.selectList(wrapper); List<Order> orders1 = orderMapper.selectList(wrapper);
orders1.forEach(order -> { orders1.forEach(order -> {
...@@ -72,19 +74,20 @@ public class OrderTask { ...@@ -72,19 +74,20 @@ public class OrderTask {
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId()); JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
String dataArray = jsonObject.getString("dataArray"); String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class); Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class);
if(Map.get("orderStatus").toString().equals("3") || Map.get("orderStatus").toString().equals("13")){ if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13")){
Wrapper<Order> wrapper1 = new EntityWrapper(); Wrapper<Order> wrapper1 = new EntityWrapper();
wrapper1.eq("xb_order_id",Map.get("orderCode")); wrapper1.eq("xb_order_id",Map.get("orderCode"));
wrapper1.eq("id",order.getId()); wrapper1.eq("id",order.getId());
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "已完成"); dataMapping.put("order_status", "已完成");
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
log.info(order.getXbOrderId()+"订单已更新");
} }
} catch (Exception e) { } catch (Exception e) {
log.info(order.getXbOrderId()+"订单更新失败",e.getMessage()); log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
} }
});*/ });
} }
} }*/
\ No newline at end of file
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