Skip to content

G
gdtel-gztel-school-center
Commit 09dc9c2f by 黄森林
Options

app开发

parent 16eab68a
Showing with 119 additions and 23 deletions
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
......@@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit;
/**
* 套餐新装
*
* @Author: chancy
* @Date: 2020/2/25 11:14
*/
......@@ -35,7 +36,7 @@ import java.util.concurrent.TimeUnit;
@RestController
@RequestMapping("/packageUpgrade")
public class PackageUpgradeController extends BaseController {
private static PackageUpgradeMapper packageUpgradeMapper;
private static AppMapper appMapper;
private static PackageMapper packageMapper;
......@@ -50,10 +51,10 @@ public class PackageUpgradeController extends BaseController {
private RedisTemplate redisTemplate;
@Autowired
public PackageUpgradeController(PackageUpgradeMapper packageUpgradeMapper, PackageMapper packageMapper,
public PackageUpgradeController(AppMapper appMapper, PackageMapper packageMapper,
YangChengTongrMapper yangChengTongrMapper, OrderMapper orderMapper
, SysUserMapper userMapper) {
PackageUpgradeController.packageUpgradeMapper = packageUpgradeMapper;
PackageUpgradeController.appMapper = appMapper;
PackageUpgradeController.packageMapper = packageMapper;
PackageUpgradeController.yangChengTongrMapper = yangChengTongrMapper;
PackageUpgradeController.orderMapper = orderMapper;
......@@ -71,7 +72,7 @@ public class PackageUpgradeController extends BaseController {
Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
if (selectOrder.contains("@")) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder);
List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper);
List<Map<String, Object>> packageUpgrade = appMapper.selectPackage(wrapper);
String nbr = null;
if (packageUpgrade.size() != 0) {
nbr = packageUpgrade.get(0).get("acc_nbr").toString();
......@@ -86,7 +87,7 @@ public class PackageUpgradeController extends BaseController {
}
if (selectOrder.length() == 18) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder);
List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper);
List<Map<String, Object>> packageUpgrade = appMapper.selectPackage(wrapper);
String nbr = null;
if (packageUpgrade.size() != 0) {
nbr = packageUpgrade.get(0).get("acc_nbr").toString();
......@@ -101,7 +102,7 @@ public class PackageUpgradeController extends BaseController {
}
if (selectOrder.length() == 11) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper);
List<Map<String, Object>> packageUpgrade = appMapper.selectPackage(wrapper);
String nbr = null;
if (packageUpgrade.size() != 0) {
nbr = packageUpgrade.get(0).get("acc_nbr").toString();
......@@ -132,7 +133,7 @@ public class PackageUpgradeController extends BaseController {
Wrapper<Package> wrapper2 = new EntityWrapper();
if (selectOrder.contains("@")) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder);
List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper);
List<Map<String, Object>> packageUpgrade = appMapper.selectPackage(wrapper);
wrapper1.eq("name", packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
......@@ -148,7 +149,7 @@ public class PackageUpgradeController extends BaseController {
}
if (selectOrder.length() == 18) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder);
List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper);
List<Map<String, Object>> packageUpgrade = appMapper.selectPackage(wrapper);
wrapper1.eq("name", packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
......@@ -163,7 +164,7 @@ public class PackageUpgradeController extends BaseController {
}
if (selectOrder.length() == 11) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper);
List<Map<String, Object>> packageUpgrade = appMapper.selectPackage(wrapper);
wrapper1.eq("name", packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
......@@ -182,6 +183,7 @@ public class PackageUpgradeController extends BaseController {
/**
* 套餐升级
*
* @param servId
* @param contactNumber 联系号码
* @param oldUserId
......@@ -192,9 +194,7 @@ public class PackageUpgradeController extends BaseController {
* @param nowPackage 现有套餐
* @param partner 用户ID
* @param businessPackage 办理套餐
* @param is_yct
*
* 羊城通
* @param is_yct 羊城通
* @param mark 羊城通是否办理(空为不办理，不为空就办理)
* @param addRess 地址（办理羊城通才使用，正常订单为空）
* @param custName 姓名 （办理羊城通才使用，正常订单为空）
......@@ -220,7 +220,7 @@ public class PackageUpgradeController extends BaseController {
if (orders.size() != 0) {
return ResponseData.error("套餐升级订单已存在，请不要重复申请！");
}
PackageUpgrade packageUpgrade = packageUpgradeMapper.selectById(servId);
PackageUpgrade packageUpgrade = appMapper.selectById(servId);
SysUser sysUser = userMapper.selectById(partner);
Order order = new Order();
String id = UUID.randomUUID().toString();
......@@ -244,12 +244,12 @@ public class PackageUpgradeController extends BaseController {
order.setOrderNumber("YRYM" + format + s);
order.setHehuorenArea(sysUser.getSubstName());
order.setHehuorenName(sysUser.getName());
String schoolId = packageUpgradeMapper.selectSchoolId(partner);
String schoolName = packageUpgradeMapper.selectSchoolById(schoolId);
String schoolId = appMapper.selectSchoolId(partner);
String schoolName = appMapper.selectSchoolById(schoolId);
order.setHehuorenSchool(schoolName);
order.setHehuorenPhone(sysUser.getPhone());
Integer insert = orderMapper.insert(order);
packageUpgradeMapper.inserOrderHis(id, "下单成功", date);
appMapper.inserOrderHis(id, "下单成功", date);
// MessageUtil.sent(contactNumber,"4","");
if (StringUtils.isNotBlank(mark)) {
String id1 = UUID.randomUUID().toString();
......@@ -268,8 +268,8 @@ public class PackageUpgradeController extends BaseController {
yangChengTong.setContactPhone(contactNumber);
yangChengTong.setCustomerPhone(businessNumber);
insert += yangChengTongrMapper.insert(yangChengTong);
packageUpgradeMapper.inserOrderHis(id1, "下单成功", date);
return ResponseData.success(id+":"+id1,"下单成功！");
appMapper.inserOrderHis(id1, "下单成功", date);
return ResponseData.success(id + ":" + id1, "下单成功！");
}
if (insert == 1) {
return ResponseData.success(id);
......@@ -295,8 +295,8 @@ public class PackageUpgradeController extends BaseController {
@RequestMapping(value = "selectUserInfo", method = RequestMethod.POST)
public ResponseData<Map<String, Object>> selectUserInfo(@RequestParam("partner") String partner) {
SysUser sysUser = userMapper.selectById(partner);
String schoolId = packageUpgradeMapper.selectSchoolId(partner);
String schoolName = packageUpgradeMapper.selectSchoolById(schoolId);
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());
......@@ -312,7 +312,7 @@ public class PackageUpgradeController extends BaseController {
*/
@RequestMapping(value = "selectOrderHis", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam("orderId") String orderId) {
List<Map<String, Object>> list = packageUpgradeMapper.selectOrderHis(orderId);
List<Map<String, Object>> list = appMapper.selectOrderHis(orderId);
return ResponseData.success(list);
}
......
common/src/main/java/com/winsun/mapper/PackageUpgradeMapper.java → common/src/main/java/com/winsun/mapper/AppMapper.java
......@@ -19,7 +19,7 @@ import java.util.Map;
*/
@Mapper
@Component
public interface PackageUpgradeMapper extends BaseMapper<PackageUpgrade> {
public interface AppMapper 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);
......@@ -43,4 +43,5 @@ public interface PackageUpgradeMapper extends BaseMapper<PackageUpgrade> {
List<String> selectPackageId(String schoolId);
}
task/pom.xml
......@@ -66,6 +66,11 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>com.winsun.gdtel.gztel</groupId>
<artifactId>common</artifactId>
<version>${service.version}</version>
</dependency>
<dependency>
<groupId>com.winsun.framework</groupId>
......
task/src/main/java/com/winsun/TaskServiceApplication.java
......@@ -29,6 +29,6 @@ public class TaskServiceApplication {
public static void main(String[] args) {
SpringApplication.run(TaskServiceApplication.class, args);
logger.info("集约平台定时任务模块启动成功!!!");
logger.info("定时任务模块启动成功!!!");
}
}
task/src/main/java/com/winsun/TimingTask/OrderTask.java 0 → 100644
package com.winsun.TimingTask;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.bean.Order;
import com.winsun.mapper.*;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import com.winsun.utils.XbkUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import java.text.ParseException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@RestController
@Configuration
@EnableScheduling
public class OrderTask {
private static OrderMapper orderMapper;
@Autowired
public OrderTask(OrderMapper orderMapper) {
OrderTask.orderMapper = orderMapper;
}
@Scheduled(cron = "0/5 * * * * ? ")
//@Scheduled(fixedRate=1000*60)
@PostMapping("/orderTask")
public void general() throws ParseException {
Wrapper<Order> wrapper = new EntityWrapper();
wrapper.eq("order_status", "待识别1");
List<Order> orders = orderMapper.selectList(wrapper);
orders.forEach(order -> {
try {
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class);
if(Map.get("orderStatus").toString().equals("3") || Map.get("orderStatus").toString().equals("13") ||
Map.get("orderStatus").toString().equals("8") || Map.get("orderStatus").toString().equals("22") ||
Map.get("orderStatus").toString().equals("21") ){
Wrapper<Order> wrapper1 = new EntityWrapper();
wrapper1.eq("xb_order_id",Map.get("orderCode"));
wrapper1.eq("id",order.getId());
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "待处理");
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
}
} catch (Exception e) {
log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
}
});
/* Wrapper<Order> wrapper2 = new EntityWrapper();
wrapper2.eq("order_status", "待活体");
List<Order> orders1 = orderMapper.selectList(wrapper);
orders1.forEach(order -> {
try {
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class);
if(Map.get("orderStatus").toString().equals("3") || Map.get("orderStatus").toString().equals("13")){
Wrapper<Order> wrapper1 = new EntityWrapper();
wrapper1.eq("xb_order_id",Map.get("orderCode"));
wrapper1.eq("id",order.getId());
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "已完成");
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
}
} catch (Exception e) {
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