Skip to content

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

融合下单

parent 0bebf3ae
Showing with 121 additions and 90 deletions
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,61 +261,67 @@ public class RongHeController { ...@@ -258,61 +261,67 @@ 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){
String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1];
Order order = new Order(); Order order = new Order();
order.setId(id);
SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat sd2 = new SimpleDateFormat("yyyyMM");
String orderNumber = "YRYM" + sd.format(new Date()) + uuid.substring(1, 12);
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
Date parse = null;
try { try {
parse = simpleDateFormat1.parse(rhTime); String uuid = UUID.randomUUID().toString();
} catch (ParseException e) { String id = uuid.split("-")[0] + uuid.split("-")[1];
e.printStackTrace();
order.setId(id);
SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat sd2 = new SimpleDateFormat("yyyyMM");
String orderNumber = "YRYM" + sd.format(new Date()) + uuid.substring(1, 12);
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
Date parse = null;
try {
parse = simpleDateFormat1.parse(rhTime);
} catch (ParseException e) {
e.printStackTrace();
}
order.setRhTime(parse);
order.setOrderNumber(orderNumber);
order.setOrderStatus(OrderStatus.NOTPAID.getName());
order.setHehuorenId(userId);
order.setCustomerName(orderView.getOrderName());
order.setContactNumber(orderView.getOrderPhone());
order.setBusinessNumber(orderView.getOrderCustomerRemarks());
order.setIdCard(orderView.getOrderNumber());
order.setCreateTime(new Date());
order.setUpdateTime(new Date());
order.setUserType("3");
order.setKapin("融合办理");
order.setStudenCard(orderView.getOrderCustomerStudentId().toString());
order.setNetNumber(orderView.getOrderCustomerAccount().toString());
order.setNetPassword(orderView.getOrderCustomerPwd().toString());
order.setUserSchool(orderView.getOrderUniversityName().toString());
order.setExpenses(orderView.getOrderSetMeal().toString());
order.setKdOrderId(orderView.getOrderSeq().toString());
SysUser sysUser = sysUserMapper.selectById(userId);
order.setHehuorenPhone(sysUser.getPhone().toString());
String schoolId = appMapper.selectSchoolId(userId);
School school = schoolMapper.selectById(schoolId);
order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenName(sysUser.getName());
order.setPackageId(productId);
order.setHehuorenArea(sysUser.getSubstName());
order.setSignImg(filePath);
List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
SysUser user = sysUserMapper.selectById(userId1.get(0));
order.setSupervisorName(user.getName());
order.setLzgh(school.getLzgh());
// 根据订单号，获取该订单信息
// 根据学校名称，获取该学校信息
Product product = productMapper.selectById(productId);
Wrapper<UniversityInfo> uiWrapper = new EntityWrapper<>();
uiWrapper.eq("university_id", product.getUniversityId());
List<Map<String, Object>> list1 = universityInfoMapper.selectMaps(uiWrapper);
order.setOrderStatus(orderStatus);
orderMapper.insert(order);
appMapper.inserOrderHis(id, "待下单！", new Date(), orderView.getOrderName());
}catch (Exception e){
e.getMessage();
} }
order.setRhTime(parse);
order.setOrderNumber(orderNumber);
order.setOrderStatus(OrderStatus.NOTPAID.getName());
order.setHehuorenId(userId);
order.setCustomerName(orderView.getOrderName());
order.setContactNumber(orderView.getOrderPhone());
order.setBusinessNumber(orderView.getOrderPhone());
order.setIdCard(orderView.getOrderNumber());
order.setCreateTime(new Date());
order.setUpdateTime(new Date());
order.setUserType("3");
order.setKapin("融合办理");
order.setStudenCard(orderView.getOrderCustomerStudentId());
order.setNetNumber(orderView.getOrderCustomerAccount().toString());
order.setNetPassword(orderView.getOrderCustomerPwd().toString());
order.setUserSchool(orderView.getOrderUniversityName().toString());
order.setExpenses(orderView.getOrderSetMeal().toString());
order.setKdOrderId(orderView.getOrderSeq().toString());
SysUser sysUser = sysUserMapper.selectById(userId);
order.setHehuorenPhone(sysUser.getPhone().toString());
String schoolId = appMapper.selectSchoolId(userId);
School school = schoolMapper.selectById(schoolId);
order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenName(sysUser.getName());
order.setPackageId(productId);
order.setHehuorenArea(sysUser.getSubstName());
order.setSignImg(filePath);
List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
SysUser user = sysUserMapper.selectById(userId1.get(0));
order.setSupervisorName(user.getName());
order.setLzgh(school.getLzgh());
// 根据订单号，获取该订单信息
// 根据学校名称，获取该学校信息
Product product = productMapper.selectById(productId);
Wrapper<UniversityInfo> uiWrapper = new EntityWrapper<>();
uiWrapper.eq("university_id", product.getUniversityId());
List<Map<String, Object>> list1 = universityInfoMapper.selectMaps(uiWrapper);
order.setOrderStatus(orderStatus);
orderMapper.insert(order);
appMapper.inserOrderHis(id, "待下单！", new Date(), orderView.getOrderName());
return ResponseData.success(order, "订单创建成功"); return ResponseData.success(order, "订单创建成功");
} }
......
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
...@@ -327,43 +327,53 @@ public class codeManagerController { ...@@ -327,43 +327,53 @@ public class codeManagerController {
@PostMapping("selectOrder") @PostMapping("selectOrder")
public ResponseData<Object> selectOrder(HttpServletRequest request, HttpServletResponse response){ public ResponseData<Object> selectOrder(HttpServletRequest request, HttpServletResponse response){
Map<String, Object> mapData = new HashMap<>(); try{
String idCard = request.getParameter("idCard"); // 身份证号 Map<String, Object> mapData = new HashMap<>();
String accountNumber = request.getParameter("accountNumber");// 多媒体账号 String idCard = request.getParameter("idCard"); // 身份证号
// 判断身份证号是否在清单中 String accountNumber = request.getParameter("accountNumber");// 多媒体账号
List<Order> list = orderMapper.selectRepeatOrder(idCard); // 判断身份证号是否在清单中
if(list.size()>0){ Wrapper<Order> orderWrapper = new EntityWrapper<>();
List<OrderView> list1 = orderMapper.selectReportOrder(list.get(0).getKdOrderId()); orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard);
if (StringUtils.isBlank(list1.get(0).getUptranseq())) { orderWrapper.in("user_type","3,5,9,10");
mapData.put("orderId", list1.get(0).getOrderId()); orderWrapper.ne("order_status","异常单");
mapData.put("orderSeq", list1.get(0).getOrderSeq()); List<Order> order = orderMapper.selectList(orderWrapper);
mapData.put("userType", list.get(0).getUserType()); if(order.size()>0){
mapData.put("kapin", list.get(0).getKapin()); Wrapper<OrderView> wrapper = new EntityWrapper<>();
mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面" wrapper.eq(StringUtils.isNotBlank(order.get(0).getKdOrderId()), "orderSeq", order.get(0).getKdOrderId());
return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面"); List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
} else { if (orderViews.get(0).getUptranseq()==null || StringUtils.isBlank(orderViews.get(0).getUptranseq())) {
mapData.put("orderSeq", list1.get(0).getOrderSeq()); mapData.put("orderId", orderViews.get(0).getOrderId());
mapData.put("uptranseq", list1.get(0).getUptranseq()); mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
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", 2);//"你已存在未支付的订单，请前往支付页面"
return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单"); return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面");
} else {
mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("uptranseq", orderViews.get(0).getUptranseq());
mapData.put("userType", order.get(0).getUserType());
mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
}
} }
}
// 判断是否在宽带清单中 // 判断是否在宽带清单中
List<Map<String, Object>> accountNumberList = orderMapper.checkOldKdUser(accountNumber); List<Map<String, Object>> accountNumberList = orderMapper.checkOldKdUser(accountNumber);
// 查询多媒体账号在甲方提供清单中是否存在 // 查询多媒体账号在甲方提供清单中是否存在
if(!accountNumberList.isEmpty() && accountNumberList.size() > 0) { //已存在纪录 if(!accountNumberList.isEmpty() && accountNumberList.size() > 0) { //已存在纪录
mapData.put("code", 1);
return ResponseData.error(mapData,"该账号已存在");
} else {
// 查询多媒体账号在订单表是否存在
List<Map<String, Object>> maps = orderMapper.checkOldhhrOrder(accountNumber);
if(!maps.isEmpty() && maps.size()>0){
mapData.put("code", 1); mapData.put("code", 1);
return ResponseData.error(mapData,"该账号已存在"); return ResponseData.error(mapData,"该账号已存在");
} else {
// 查询多媒体账号在订单表是否存在
List<Map<String, Object>> maps = orderMapper.checkOldhhrOrder(accountNumber);
if(!maps.isEmpty() && maps.size()>0){
mapData.put("code", 1);
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