Skip to content

G
gdtel-gztel-school-center
Commit a8a1648e by 陈浩建
Options

融合下单

parent 0bebf3ae
Showing with 147 additions and 102 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.mapper.Wrapper; ...@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.*; import com.winsun.bean.*;
import com.winsun.constant.Constant; import com.winsun.constant.Constant;
import com.winsun.constant.FilePath;
import com.winsun.constant.OrderStatus; import com.winsun.constant.OrderStatus;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.outSideSystem.IntelligenceSendOrder;
import com.winsun.utils.*; import com.winsun.utils.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -25,8 +27,10 @@ import org.apache.http.util.EntityUtils; ...@@ -25,8 +27,10 @@ import org.apache.http.util.EntityUtils;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder; import java.net.URLEncoder;
...@@ -63,6 +67,17 @@ public class DankuanController { ...@@ -63,6 +67,17 @@ public class DankuanController {
@Autowired @Autowired
private SysUserMapper sysUserMapper; private SysUserMapper sysUserMapper;
@Resource
private RedisTemplate<String, String> redisTemplate;
@Resource
private RedisLockUtil redisLockUtil;
@Autowired
private Base64ToImgUtils base64ToImgUtils;
@Autowired
private IntelligenceSendOrder intelligenceSendOrder;
/** /**
* 查询单宽办理接口 * 查询单宽办理接口
* *
...@@ -93,25 +108,38 @@ public class DankuanController { ...@@ -93,25 +108,38 @@ public class DankuanController {
/** /**
* 创建单宽order_view * 创建单宽order_view
* *
* @param orderName
* @param orderPhone
* @param orderNumber
* @param orderCustomerStudentId
* @param orderCustomerAccount
* @param orderCustomerPwd
* @param orderSetMeal
* @param productId
* @param webOrderAmount
* @param partner
* @return * @return
* @throws Exception
*/ */
@RequestMapping("/createProductOrder") @PostMapping("/createProductOrder")
public ResponseData<Object> createProductOrder(@RequestParam("orderName") String orderName, @RequestParam("orderPhone") String orderPhone, public ResponseData<Object> createProductOrder(HttpServletRequest request,HttpServletRequest response){
@RequestParam("orderNumber") String orderNumber, @RequestParam("orderCustomerStudentId") String orderCustomerStudentId, String orderName = request.getParameter("orderName");
@RequestParam("orderCustomerAccount") String orderCustomerAccount, @RequestParam("orderCustomerPwd") String orderCustomerPwd, String orderPhone = request.getParameter("orderPhone");
@RequestParam("orderSetMeal") String orderSetMeal, @RequestParam("productId") String productId, String orderNumber = request.getParameter("orderNumber");
@RequestParam("webOrderAmount") String webOrderAmount, @RequestParam("partner") String partner, @RequestParam(value = "setMealIndex") String setMealIndex) throws Exception { String banLiPhone = request.getParameter("banLiPhone");
String orderCustomerStudentId = request.getParameter("orderCustomerStudentId");
String orderCustomerAccount = request.getParameter("orderCustomerAccountInfo");
String orderCustomerPwd = request.getParameter("orderCustomerPwd");
String orderSetMeal = request.getParameter("orderSetMeal");
String productId = request.getParameter("productId");
String webOrderAmount = request.getParameter("webOrderAmount");
String partner = request.getParameter("partner");
String setMealIndex = request.getParameter("setMealIndex");
String imgUrl = request.getParameter("imgUrl");
String filePath = "";
try{
String uuid = UUID.randomUUID().toString();
boolean boo1 = redisLockUtil.redisLock(orderNumber,uuid,10);
boolean boo2 = redisLockUtil.redisLock(orderCustomerAccount,uuid,10);
if(!boo1 || !boo2){
return ResponseData.error("重复下单！");
}
if(StringUtils.isBlank(imgUrl)){
return ResponseData.error("签名失败！");
}
if(StringUtils.isNotBlank(imgUrl)){
filePath = base64ToImgUtils.base64ToImg(imgUrl, FilePath.PATH.getValue()+FilePath.IMGURLPATH.getValue());
}
OrderView orderV = new OrderView(); OrderView orderV = new OrderView();
String orderSeq = RandomUtil.RandomNumber(20); String orderSeq = RandomUtil.RandomNumber(20);
Product product = productMapper.selectById(productId); Product product = productMapper.selectById(productId);
...@@ -139,16 +167,25 @@ public class DankuanController { ...@@ -139,16 +167,25 @@ public class DankuanController {
} }
orderView.setCustomerId("xyzxyql"); orderView.setCustomerId("xyzxyql");
orderView.setOrderCustomerType("学生"); orderView.setOrderCustomerType("学生");
ResponseData<Object> res = null;
orderView.setSetMealIndex(setMealIndex);
Integer insert = orderViewMapper.insert(orderView);
if (webOrderAmount.equals("0")) { if (webOrderAmount.equals("0")) {
ResponseData<Object> res = createOrder(orderView, partner, orderSeq); res = createOrder(productId,orderView, partner,filePath,"未下单");
if (!res.isSuccess()) { Map<String,Object> map = orderMapper.selectKdOrder(orderSeq);
return res; intelligenceSendOrder.singleBroadSendOrder(map);
}
Order order =(Order) res.getData(); Order order =(Order) res.getData();
orderV.setOrderRf2(order.getId()); orderV.setOrderRf2(order.getId());
}else {
res = createOrder(productId,orderView, partner,filePath,"未支付");
}
if (!res.isSuccess()) {
return ResponseData.error("网络超时，请重试!");
} }
orderView.setSetMealIndex(setMealIndex);
Integer insert = orderViewMapper.insert(orderView);
if (insert == 1) { if (insert == 1) {
orderV.setOrderId(orderView.getOrderId()); orderV.setOrderId(orderView.getOrderId());
orderV.setOrderSeq(orderView.getOrderSeq()); orderV.setOrderSeq(orderView.getOrderSeq());
...@@ -156,34 +193,42 @@ public class DankuanController { ...@@ -156,34 +193,42 @@ public class DankuanController {
return ResponseData.success(orderV, "订单提交完成！"); return ResponseData.success(orderV, "订单提交完成！");
} }
return ResponseData.error("提交失败！"); return ResponseData.error("提交失败！");
}catch (Exception e){
return ResponseData.error("网络超时，请重试!");
}finally {
redisTemplate.delete(orderNumber);
redisTemplate.delete(orderCustomerAccount);
}
} }
/** /**
* 0元调用 创建order * 0元调用 创建order
* @param orderView * @param orderView
* @param userId * @param userId
* @param orderseq
* @return * @return
* @throws Exception * @throws Exception
*/ */
public ResponseData<Object> createOrder(OrderView orderView, String userId, String orderseq) throws Exception { public ResponseData<Object> createOrder(String productId, OrderView orderView, String userId,String filePath,String orderStatus){
Order order = new Order();
try{
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1]; String id = uuid.split("-")[0] + uuid.split("-")[1];
Order order = new Order();
order.setId(id); order.setId(id);
order.setOrderNumber(orderView.getOrderSeq()); order.setOrderNumber(orderView.getOrderSeq().toString());
order.setOrderStatus(OrderStatus.NOTPAID.getName()); order.setOrderStatus(OrderStatus.NOTPAID.getName().toString());
order.setHehuorenId(userId); order.setHehuorenId(userId);
order.setCustomerName(orderView.getOrderName()); order.setCustomerName(orderView.getOrderName());
order.setContactNumber(orderView.getOrderPhone()); order.setContactNumber(orderView.getOrderPhone());
order.setIdCard(orderView.getOrderNumber()); order.setIdCard(orderView.getOrderNumber().toString());
order.setCreateTime(new Date()); order.setCreateTime(new Date());
order.setUserType("5"); order.setUserType("5");
order.setNetNumber(orderView.getOrderCustomerAccount()); order.setKapin("单宽业务");
order.setNetPassword(orderView.getOrderCustomerPwd()); order.setStudenCard(orderView.getOrderCustomerStudentId().toString());
order.setUserSchool(orderView.getOrderUniversityName()); order.setNetNumber(orderView.getOrderCustomerAccount().toString());
order.setExpenses(orderView.getOrderSetMeal()); order.setNetPassword(orderView.getOrderCustomerPwd().toString());
order.setKdOrderId(orderView.getOrderSeq()); order.setUserSchool(orderView.getOrderUniversityName().toString());
order.setExpenses(orderView.getOrderSetMeal().toString());
order.setKdOrderId(orderView.getOrderSeq().toString());
SysUser sysUser = sysUserMapper.selectById(userId); SysUser sysUser = sysUserMapper.selectById(userId);
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
String schoolId = appMapper.selectSchoolId(userId); String schoolId = appMapper.selectSchoolId(userId);
...@@ -191,60 +236,29 @@ public class DankuanController { ...@@ -191,60 +236,29 @@ public class DankuanController {
order.setHehuorenSchool(school.getSchoolName()); order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName());
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(sysUser.getSubstName());
order.setSignImg(filePath);
List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId); List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
SysUser user = sysUserMapper.selectById(userId1.get(0)); SysUser user = sysUserMapper.selectById(userId1.get(0));
order.setSupervisorName(user.getName()); order.setSupervisorName(user.getName());
order.setLzgh(school.getLzgh()); order.setLzgh(school.getLzgh());
order.setOrderStatus(orderStatus);
// 根据订单号，获取该订单信息
// 根据学校名称，获取该学校信息 // 根据学校名称，获取该学校信息
Wrapper<UniversityInfo> wrapper1 = new EntityWrapper<>(); Product product = productMapper.selectById(productId);
wrapper1.eq("university_name", orderView.getOrderUniversityName()); Wrapper<UniversityInfo> uiWrapper = new EntityWrapper<>();
wrapper1.eq("university_region", orderView.getOrderRegion()); uiWrapper.eq("university_id", product.getUniversityId());
Map<String, Object> schoolMap = universityInfoMapper.selectMaps(wrapper1).get(0); Map<String, Object> schoolMap = universityInfoMapper.selectMaps(uiWrapper).get(0);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
String currentTimeStr = simpleDateFormat.format(new Date());
String productId = "519";
if (StringUtils.isBlank(orderView.getOrderseqThd())) {
JSONObject productJsonObject = getProductId(currentTimeStr);
if (productJsonObject.toString().indexOf("list") == -1) {
return ResponseData.error("未找到产品信息，如有疑问请联系客服！");
}
JSONArray list = productJsonObject.getJSONArray("list");
String productName = "校园宽带0元";
for (int i = 0; i < list.size(); i++) {
JSONObject itmeJson = JSONObject.parseObject(list.get(i).toString());
// 判断获取的全部产品与订单产品符合的拿取对应的ID
if (itmeJson.getString("name").indexOf(productName) != -1) {
productId = itmeJson.getString("id"); // 获取对应产品ID
break;
}
}
}
String saleId = "1475"; // 销售id
JSONObject saleJsonObject = getSaleId(productId, currentTimeStr); // 获取销售ID
log.info("----------调用智能平台的获取销售品接口返回值：" + saleJsonObject);
JSONArray saleList = saleJsonObject.getJSONArray("list");
JSONObject itmeJson = JSONObject.parseObject(saleList.get(0).toString());
saleId = itmeJson.getString("saleId");
JSONObject submitOrderJsonObject = getOrderInfo(schoolMap, orderView, currentTimeStr, productId, saleId, "", "00000", "0元", "00000");
String orderNum = (String) submitOrderJsonObject.get("orderNumber");
if (StringUtils.isNotBlank(orderNum)) {
Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq("orderSeq", orderseq);
Map<String, Object> dataMapping1 = new HashMap<>();
dataMapping1.put("orderSeqTHD", orderNum);
dataMapping1.put("status", "已支付");
orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping1), wrapper);
order.setOrderStatus("审核中");
order.setOrderId(orderNum);
order.setThStatus(submitOrderJsonObject.get("status").toString());
orderMapper.insert(order); orderMapper.insert(order);
appMapper.inserOrderHis(id, "待审核！", new Date(), orderView.getOrderName()); appMapper.inserOrderHis(id, "待审核！", new Date(), orderView.getOrderName());
} else { }catch (Exception e){
return ResponseData.error("智能平台订单创建失败，如有疑问请联系客服！"); e.getMessage();
Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(orderView.getOrderSeq().toString()), "orderSeq", orderView.getOrderSeq().toString());
orderViewMapper.delete(wrapper);
return ResponseData.error("订单创建失败");
} }
return ResponseData.success(order, "智能平台订单创建成功");
return ResponseData.success(order, "订单创建成功");
} }
/** /**
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -125,12 +125,12 @@ public class RongHeController { ...@@ -125,12 +125,12 @@ public class RongHeController {
* 支付平台异步更新后台地址，主要对订单进去保存和提交订单到智能平台上 * 支付平台异步更新后台地址，主要对订单进去保存和提交订单到智能平台上
* *
* @return * @return
* @throws Exception
*/ */
@PostMapping("/createRongHeOrder") @PostMapping("/createRongHeOrder")
public ResponseData<Object> createRongHeOrder(HttpServletRequest request,HttpServletRequest response){ public ResponseData<Object> createRongHeOrder(HttpServletRequest request,HttpServletRequest response){
String orderName = request.getParameter("orderName"); String orderName = request.getParameter("orderName");
String orderPhone = request.getParameter("orderPhone"); String orderPhone = request.getParameter("orderPhone");
String banLiPhone = request.getParameter("banLiPhone");
String orderNumber = request.getParameter("orderNumber"); String orderNumber = request.getParameter("orderNumber");
String orderCustomerStudentId = request.getParameter("orderCustomerStudentId"); String orderCustomerStudentId = request.getParameter("orderCustomerStudentId");
String orderCustomerAccount = request.getParameter("orderCustomerAccountInfo"); String orderCustomerAccount = request.getParameter("orderCustomerAccountInfo");
...@@ -139,7 +139,6 @@ public class RongHeController { ...@@ -139,7 +139,6 @@ public class RongHeController {
String productId = request.getParameter("productId"); String productId = request.getParameter("productId");
String webOrderAmount = request.getParameter("webOrderAmount"); String webOrderAmount = request.getParameter("webOrderAmount");
String partner = request.getParameter("partner"); String partner = request.getParameter("partner");
String banLiPhone = request.getParameter("banLiPhone");
String rhTime = request.getParameter("rhTime"); String rhTime = request.getParameter("rhTime");
String setMealIndex = request.getParameter("setMealIndex"); String setMealIndex = request.getParameter("setMealIndex");
String imgUrl = request.getParameter("imgUrl"); String imgUrl = request.getParameter("imgUrl");
...@@ -204,6 +203,9 @@ public class RongHeController { ...@@ -204,6 +203,9 @@ public class RongHeController {
prices = priceArry[index] + "元"; prices = priceArry[index] + "元";
} }
if(StringUtils.isBlank(expenses)){
expenses = "";
}
orderView.setExpenses(expenses+byStr); orderView.setExpenses(expenses+byStr);
orderView.setProductName(product.getProductTitle());// 产品名称 orderView.setProductName(product.getProductTitle());// 产品名称
orderView.setOrderDate(new Date()); // 提交时间 orderView.setOrderDate(new Date()); // 提交时间
...@@ -227,6 +229,8 @@ public class RongHeController { ...@@ -227,6 +229,8 @@ public class RongHeController {
ResponseData<Object> res = null; ResponseData<Object> res = null;
if (webOrderAmount.equals("0")) { if (webOrderAmount.equals("0")) {
res = createOrder(productId, orderView, partner, rhTime,filePath,"未下单"); res = createOrder(productId, orderView, partner, rhTime,filePath,"未下单");
Order order =(Order) res.getData();
orderV.setOrderRf2(order.getId());
}else { }else {
res = createOrder(productId, orderView, partner, rhTime,filePath,"未支付"); res = createOrder(productId, orderView, partner, rhTime,filePath,"未支付");
} }
...@@ -234,8 +238,7 @@ public class RongHeController { ...@@ -234,8 +238,7 @@ public class RongHeController {
if (!res.isSuccess()) { if (!res.isSuccess()) {
return ResponseData.error("网络超时，请重试!"); return ResponseData.error("网络超时，请重试!");
} }
Order order =(Order) res.getData();
orderV.setOrderRf2(order.getId());
orderView.setSetMealIndex(setMealIndex); orderView.setSetMealIndex(setMealIndex);
Integer insert = 0; Integer insert = 0;
...@@ -258,10 +261,11 @@ public class RongHeController { ...@@ -258,10 +261,11 @@ public class RongHeController {
} }
public ResponseData<Object> createOrder(String productId, OrderView orderView, String userId, String rhTime,String filePath,String orderStatus){ public ResponseData<Object> createOrder(String productId, OrderView orderView, String userId, String rhTime,String filePath,String orderStatus){
Order order = new Order();
try {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1]; String id = uuid.split("-")[0] + uuid.split("-")[1];
Order order = new Order();
order.setId(id); order.setId(id);
SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat sd2 = new SimpleDateFormat("yyyyMM"); SimpleDateFormat sd2 = new SimpleDateFormat("yyyyMM");
...@@ -279,13 +283,14 @@ public class RongHeController { ...@@ -279,13 +283,14 @@ public class RongHeController {
order.setHehuorenId(userId); order.setHehuorenId(userId);
order.setCustomerName(orderView.getOrderName()); order.setCustomerName(orderView.getOrderName());
order.setContactNumber(orderView.getOrderPhone()); order.setContactNumber(orderView.getOrderPhone());
order.setBusinessNumber(orderView.getOrderPhone()); order.setBusinessNumber(orderView.getOrderCustomerRemarks());
order.setIdCard(orderView.getOrderNumber()); order.setIdCard(orderView.getOrderNumber());
order.setCreateTime(new Date()); order.setCreateTime(new Date());
order.setUpdateTime(new Date()); order.setUpdateTime(new Date());
order.setUserType("3"); order.setUserType("3");
order.setKapin("融合办理"); order.setKapin("融合办理");
order.setStudenCard(orderView.getOrderCustomerStudentId());
order.setStudenCard(orderView.getOrderCustomerStudentId().toString());
order.setNetNumber(orderView.getOrderCustomerAccount().toString()); order.setNetNumber(orderView.getOrderCustomerAccount().toString());
order.setNetPassword(orderView.getOrderCustomerPwd().toString()); order.setNetPassword(orderView.getOrderCustomerPwd().toString());
order.setUserSchool(orderView.getOrderUniversityName().toString()); order.setUserSchool(orderView.getOrderUniversityName().toString());
...@@ -313,6 +318,10 @@ public class RongHeController { ...@@ -313,6 +318,10 @@ public class RongHeController {
order.setOrderStatus(orderStatus); order.setOrderStatus(orderStatus);
orderMapper.insert(order); orderMapper.insert(order);
appMapper.inserOrderHis(id, "待下单！", new Date(), orderView.getOrderName()); appMapper.inserOrderHis(id, "待下单！", new Date(), orderView.getOrderName());
}catch (Exception e){
e.getMessage();
}
return ResponseData.success(order, "订单创建成功"); return ResponseData.success(order, "订单创建成功");
} }
......
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
...@@ -327,25 +327,32 @@ public class codeManagerController { ...@@ -327,25 +327,32 @@ public class codeManagerController {
@PostMapping("selectOrder") @PostMapping("selectOrder")
public ResponseData<Object> selectOrder(HttpServletRequest request, HttpServletResponse response){ public ResponseData<Object> selectOrder(HttpServletRequest request, HttpServletResponse response){
try{
Map<String, Object> mapData = new HashMap<>(); Map<String, Object> mapData = new HashMap<>();
String idCard = request.getParameter("idCard"); // 身份证号 String idCard = request.getParameter("idCard"); // 身份证号
String accountNumber = request.getParameter("accountNumber");// 多媒体账号 String accountNumber = request.getParameter("accountNumber");// 多媒体账号
// 判断身份证号是否在清单中 // 判断身份证号是否在清单中
List<Order> list = orderMapper.selectRepeatOrder(idCard); Wrapper<Order> orderWrapper = new EntityWrapper<>();
if(list.size()>0){ orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard);
List<OrderView> list1 = orderMapper.selectReportOrder(list.get(0).getKdOrderId()); orderWrapper.in("user_type","3,5,9,10");
if (StringUtils.isBlank(list1.get(0).getUptranseq())) { orderWrapper.ne("order_status","异常单");
mapData.put("orderId", list1.get(0).getOrderId()); List<Order> order = orderMapper.selectList(orderWrapper);
mapData.put("orderSeq", list1.get(0).getOrderSeq()); if(order.size()>0){
mapData.put("userType", list.get(0).getUserType()); Wrapper<OrderView> wrapper = new EntityWrapper<>();
mapData.put("kapin", list.get(0).getKapin()); wrapper.eq(StringUtils.isNotBlank(order.get(0).getKdOrderId()), "orderSeq", order.get(0).getKdOrderId());
List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
if (orderViews.get(0).getUptranseq()==null || StringUtils.isBlank(orderViews.get(0).getUptranseq())) {
mapData.put("orderId", orderViews.get(0).getOrderId());
mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("userType", order.get(0).getUserType());
mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面" mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面"
return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面"); return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面");
} else { } else {
mapData.put("orderSeq", list1.get(0).getOrderSeq()); mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("uptranseq", list1.get(0).getUptranseq()); mapData.put("uptranseq", orderViews.get(0).getUptranseq());
mapData.put("userType", list.get(0).getUserType()); mapData.put("userType", order.get(0).getUserType());
mapData.put("kapin", list.get(0).getKapin()); mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单" mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单"); return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
} }
...@@ -365,6 +372,9 @@ public class codeManagerController { ...@@ -365,6 +372,9 @@ public class codeManagerController {
return ResponseData.error(mapData,"该账号已存在"); return ResponseData.error(mapData,"该账号已存在");
} }
} }
}catch (Exception e){
return ResponseData.error("连接超时，请重试");
}
return ResponseData.success(); return ResponseData.success();
} }
} }
common/src/main/java/com/winsun/mapper/OrderMapper.java
...@@ -109,6 +109,12 @@ public interface OrderMapper extends BaseMapper<Order> { ...@@ -109,6 +109,12 @@ public interface OrderMapper extends BaseMapper<Order> {
*/ */
List<Map<String, Object>> selectBroadList(String accountNumber); List<Map<String, Object>> selectBroadList(String accountNumber);
/**
* 查询宽带订单
* @param KdOrderID
* @return
*/
Map<String, Object> selectKdOrder(String KdOrderID);
/** /**
* 查询多媒体账号在甲方提供清单中是否存在 * 查询多媒体账号在甲方提供清单中是否存在
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
...@@ -250,7 +250,7 @@ public class IntelligenceSendOrder { ...@@ -250,7 +250,7 @@ public class IntelligenceSendOrder {
private JSONObject getQueryOrderInfo( private JSONObject getQueryOrderInfo(
String orderNum, String currentTimeStr, int count) throws Exception { String orderNum, String currentTimeStr, int count) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
// HttpHost proxy = new HttpHost("172.18.101.170", 3128); HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(50000) .setSocketTimeout(50000)
...@@ -344,7 +344,7 @@ public class IntelligenceSendOrder { ...@@ -344,7 +344,7 @@ public class IntelligenceSendOrder {
int count) int count)
throws Exception { throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
// HttpHost proxy = new HttpHost("172.18.101.170", 3128); HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(50000) .setSocketTimeout(50000)
...@@ -360,6 +360,7 @@ public class IntelligenceSendOrder { ...@@ -360,6 +360,7 @@ public class IntelligenceSendOrder {
httpPost.setConfig(requestConfig); httpPost.setConfig(requestConfig);
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数 Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数
qParams.add(new BasicNameValuePair("service", "order.broadband.create")); // api标识，必填 qParams.add(new BasicNameValuePair("service", "order.broadband.create")); // api标识，必填
signMap.put("service", "order.broadband.create"); // api标识，必填 signMap.put("service", "order.broadband.create"); // api标识，必填
qParams.add(new BasicNameValuePair("userName", Constant.ZHENGSHIAUCCON)); // 用户名，必填 qParams.add(new BasicNameValuePair("userName", Constant.ZHENGSHIAUCCON)); // 用户名，必填
......
common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
...@@ -189,4 +189,8 @@ ...@@ -189,4 +189,8 @@
UPDATE hhr_order SET order_status = '已完成' WHERE id IN (SELECT id FROM(SELECT id FROM hhr_order WHERE order_status='已发货' AND TO_DAYS(NOW()) - TO_DAYS(create_time) > 7) t1) UPDATE hhr_order SET order_status = '已完成' WHERE id IN (SELECT id FROM(SELECT id FROM hhr_order WHERE order_status='已发货' AND TO_DAYS(NOW()) - TO_DAYS(create_time) > 7) t1)
</update> </update>
<select id="selectKdOrder" parameterType="String" resultType="HashMap">
select * from hhr_order where order_status !='异常单' and kd_order_id = #{KdOrderID}
</select>
</mapper> </mapper>
\ 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