Skip to content

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

修改下单传参参数orderSeq

parent a0c27372
Showing with 76 additions and 49 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -186,7 +186,6 @@ public class DankuanController { ...@@ -186,7 +186,6 @@ public class DankuanController {
return ResponseData.error("网络超时，请重试!"); return ResponseData.error("网络超时，请重试!");
} }
if (insert == 1) { if (insert == 1) {
orderV.setOrderId(orderView.getOrderId());
orderV.setOrderSeq(orderView.getOrderSeq()); orderV.setOrderSeq(orderView.getOrderSeq());
orderV.setWebOrderAmount(webOrderAmount); orderV.setWebOrderAmount(webOrderAmount);
return ResponseData.success(orderV, "订单提交完成！"); return ResponseData.success(orderV, "订单提交完成！");
...@@ -213,8 +212,6 @@ public class DankuanController { ...@@ -213,8 +212,6 @@ public class DankuanController {
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.setId(id); 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");
String orderNumber = "YRYM" + sd.format(new Date()) + id.substring(1, 12); String orderNumber = "YRYM" + sd.format(new Date()) + id.substring(1, 12);
...@@ -415,7 +412,7 @@ public class DankuanController { ...@@ -415,7 +412,7 @@ public class DankuanController {
/** /**
* 支付接口 * 支付接口
* *
* @param orderId * @param orderSeq
* @param ipay * @param ipay
* @param userId * @param userId
* @param request * @param request
...@@ -424,19 +421,19 @@ public class DankuanController { ...@@ -424,19 +421,19 @@ public class DankuanController {
* @throws Exception * @throws Exception
*/ */
@PostMapping(value = "orderPay") @PostMapping(value = "orderPay")
public ResponseData<Object> toPaymentPlatformPage(@RequestParam("orderId") String orderId, @RequestParam("ipay") String ipay, @RequestParam("userId") String userId, HttpServletRequest request, HttpServletResponse response) throws Exception { public ResponseData<Object> toPaymentPlatformPage(@RequestParam("orderSeq") String orderSeq, @RequestParam("ipay") String ipay, @RequestParam("userId") String userId, HttpServletRequest request, HttpServletResponse response){
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
try { try {
boolean boo1 = redisLockUtil.redisLock(orderId,uuid,10); boolean boo1 = redisLockUtil.redisLock(orderSeq,uuid,10);
if(!boo1){ if(!boo1){
return ResponseData.error("已在支付中"); return ResponseData.error("已在支付中");
} }
String result = JsoupMethodZhifu(orderId, ipay, userId, request, response); String result = JsoupMethodZhifu(orderSeq, ipay, userId, request, response);
return ResponseData.success(result); return ResponseData.success(result);
}catch (Exception e){ }catch (Exception e){
e.getMessage(); e.getMessage();
}finally { }finally {
redisLockUtil.deleteLock(orderId); redisLockUtil.deleteLock(orderSeq);
} }
return ResponseData.error("订单异常"); return ResponseData.error("订单异常");
} }
...@@ -445,17 +442,18 @@ public class DankuanController { ...@@ -445,17 +442,18 @@ public class DankuanController {
* @author ljh * @author ljh
* @Description:支付请求 * @Description:支付请求
*/ */
public String JsoupMethodZhifu(String orderId, String ipay, String userId, public String JsoupMethodZhifu(String orderSeq, String ipay, String userId,
HttpServletRequest request, HttpServletResponse response) throws Exception { HttpServletRequest request, HttpServletResponse response) throws Exception {
log.info("----------首先发送支付请求接口----------"); log.info("----------首先发送支付请求接口----------");
//查询订单信息
Order order = orderMapper.selectById(orderId);
OrderView orderView = orderViewMapper.selectById(order.getKdOrderId());
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];
//修改支付方式 //修改支付方式
Wrapper<OrderView> wrapper = new EntityWrapper<>(); Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq("order_id", orderId); wrapper.eq("orderSeq", orderSeq);
//查询订单信息
OrderView orderView = orderViewMapper.selectList(wrapper).get(0);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("ipay", ipay); dataMapping.put("ipay", ipay);
...@@ -478,12 +476,12 @@ public class DankuanController { ...@@ -478,12 +476,12 @@ public class DankuanController {
map.put("ORDERNUMBER", orderView.getOrderNumber());//身份证 map.put("ORDERNUMBER", orderView.getOrderNumber());//身份证
if (Constant.Payment1.equals(ipay)) { // if (Constant.Payment1.equals(ipay)) {
//支付成功回调的页面 // //支付成功回调的页面
// String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toPaymentSuccessPage?id=" + userId +"orderId="+id; // // String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toPaymentSuccessPage?id=" + userId +"orderId="+id;
String MERCHANTURL = "http://3715zj2369.qicp.vip/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id; String MERCHANTURL = "http://3715zj2369.qicp.vip:52511/#/hhr/dkSuccessful?id="+userId+"&"+"orderSeq="+orderSeq;
map.put("MERCHANTURL", MERCHANTURL); map.put("MERCHANTURL", MERCHANTURL);
} // }
//单宽回调后端接口地址 //单宽回调后端接口地址
// map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser"); // map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -271,7 +271,6 @@ public class RongHeController { ...@@ -271,7 +271,6 @@ public class RongHeController {
insert = orderViewMapper.insert(orderView); insert = orderViewMapper.insert(orderView);
if (insert == 1) { if (insert == 1) {
orderV.setOrderId(orderView.getOrderId());
orderV.setOrderSeq(orderSeq); orderV.setOrderSeq(orderSeq);
orderV.setWebOrderAmount(webOrderAmount); orderV.setWebOrderAmount(webOrderAmount);
return ResponseData.success(orderV, "订单提交完成！"); return ResponseData.success(orderV, "订单提交完成！");
...@@ -401,21 +400,21 @@ public class RongHeController { ...@@ -401,21 +400,21 @@ public class RongHeController {
@PostMapping(value = "orderPay") @PostMapping(value = "orderPay")
public ResponseData<Object> toPaymentPlatformPage(HttpServletRequest request, HttpServletResponse response){ public ResponseData<Object> toPaymentPlatformPage(HttpServletRequest request, HttpServletResponse response){
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String orderId = request.getParameter("orderId"); String orderSeq = request.getParameter("orderSeq");
String ipay = request.getParameter("ipay"); String ipay = request.getParameter("ipay");
String userId = request.getParameter("userId"); String userId = request.getParameter("userId");
String rhTime = request.getParameter("rhTime"); String rhTime = request.getParameter("rhTime");
try { try {
boolean boo1 = redisLockUtil.redisLock(orderId,uuid,10); boolean boo1 = redisLockUtil.redisLock(orderSeq,uuid,10);
if(!boo1){ if(!boo1){
return ResponseData.error("已在支付中"); return ResponseData.error("已在支付中");
} }
String result = JsoupMethodZhifu(orderId, ipay, userId, request, response,rhTime); String result = JsoupMethodZhifu(orderSeq, ipay, userId, request, response,rhTime);
return ResponseData.success(result); return ResponseData.success(result);
}catch (Exception e){ }catch (Exception e){
e.getMessage(); e.getMessage();
}finally { }finally {
redisLockUtil.deleteLock(orderId); redisLockUtil.deleteLock(orderSeq);
} }
return ResponseData.error("订单异常"); return ResponseData.error("订单异常");
} }
...@@ -429,18 +428,18 @@ public class RongHeController { ...@@ -429,18 +428,18 @@ public class RongHeController {
* @author ljh * @author ljh
* @Description:支付请求 * @Description:支付请求
*/ */
public String JsoupMethodZhifu(String orderId, String ipay, String userId, public String JsoupMethodZhifu(String orderSeq, String ipay, String userId,
HttpServletRequest request, HttpServletResponse response, String rhTime){ HttpServletRequest request, HttpServletResponse response, String rhTime){
try{ try{
log.info("----------首先发送支付请求接口----------"); log.info("----------首先发送支付请求接口----------");
//查询订单信息 //查询订单信息
Order order = orderMapper.selectById(orderId);
OrderView orderView = orderViewMapper.selectById(order.getKdOrderId());
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];
//修改支付方式 //修改支付方式
Wrapper<OrderView> wrapper = new EntityWrapper<>(); Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq("order_id", orderId); wrapper.eq("orderSeq", orderSeq);
OrderView orderView = orderViewMapper.selectList(wrapper).get(0);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("ipay", ipay); dataMapping.put("ipay", ipay);
......
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
...@@ -343,9 +343,7 @@ public class codeManagerController { ...@@ -343,9 +343,7 @@ public class codeManagerController {
wrapper.eq(StringUtils.isNotBlank(order.get(0).getKdOrderId()), "orderSeq", order.get(0).getKdOrderId()); wrapper.eq(StringUtils.isNotBlank(order.get(0).getKdOrderId()), "orderSeq", order.get(0).getKdOrderId());
List<OrderView> orderViews = orderViewMapper.selectList(wrapper); List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
if("0".equals(orderViews.get(0).getWebOrderAmount())){ if("0".equals(orderViews.get(0).getWebOrderAmount())){
mapData.put("orderId", order.get(0).getId());
mapData.put("orderSeq", orderViews.get(0).getOrderSeq()); mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("uptranseq", orderViews.get(0).getUptranseq());
mapData.put("userType", order.get(0).getUserType()); mapData.put("userType", order.get(0).getUserType());
mapData.put("kapin", order.get(0).getKapin()); mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单" mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
...@@ -353,12 +351,17 @@ public class codeManagerController { ...@@ -353,12 +351,17 @@ public class codeManagerController {
} }
if (orderViews.get(0).getUptranseq()==null || if (orderViews.get(0).getUptranseq()==null ||
StringUtils.isBlank(orderViews.get(0).getUptranseq())) { StringUtils.isBlank(orderViews.get(0).getUptranseq())) {
mapData.put("orderId", order.get(0).getId());
mapData.put("orderSeq", orderViews.get(0).getOrderSeq()); mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("userType", order.get(0).getUserType()); mapData.put("userType", order.get(0).getUserType());
mapData.put("kapin", order.get(0).getKapin()); mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面" mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面"
return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面"); return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面");
}else {
mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("userType", order.get(0).getUserType());
mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
} }
} }
......
old-user/src/main/java/com/winsun/controller/ChooseController.java
...@@ -64,23 +64,37 @@ public class ChooseController { ...@@ -64,23 +64,37 @@ public class ChooseController {
* 查询订单详情 * 查询订单详情
*/ */
@RequestMapping(value = "selectOrderInfo", method = RequestMethod.POST) @RequestMapping(value = "selectOrderInfo", method = RequestMethod.POST)
public ResponseData<Order> selectOrderInfo(@RequestParam("orderId") String orderId) { public ResponseData<Order> selectOrderInfo(@RequestParam(value = "orderid",required = false) String orderId,@RequestParam(value = "orderSeq",required = false) String orderSeq) {
Order order = orderMapper.selectById(orderId); try{
if("待活体".equals(order.getOrderStatus()) || "待识别".equals(order.getOrderStatus())){ Wrapper<Order> orderWrapper = new EntityWrapper<>();
general(orderId); if(StringUtils.isBlank(orderSeq)&&StringUtils.isBlank(orderId)){
} return ResponseData.error("参数缺少");
order.setIdCard(""); }
order.setGiftAccount(""); orderWrapper.eq(StringUtils.isNotBlank(orderId), "id", orderId);
order.setGiftCypher(""); orderWrapper.eq(StringUtils.isNotBlank(orderSeq), "kd_order_id", orderSeq);
order.setNetPassword(""); Order order = orderMapper.selectList(orderWrapper).get(0);
if(StringUtils.isNotBlank(order.getNetNumber())){ orderId = order.getOrderId();
String[] split = order.getNetNumber().split("@");
order.setNetNumber(order.getNetNumber().substring(0,1)+"****"+split[1]); if("待活体".equals(order.getOrderStatus()) || "待识别".equals(order.getOrderStatus())){
} general(orderId);
if(StringUtils.isNotBlank(order.getContactNumber())&&order.getContactNumber().length()==11){ }
order.setContactNumber(order.getContactNumber().substring(0,3)+"****"+order.getContactNumber().substring(7,11)); order.setIdCard("");
order.setGiftAccount("");
order.setGiftCypher("");
order.setNetPassword("");
if(StringUtils.isNotBlank(order.getNetNumber())){
String[] split = order.getNetNumber().split("@");
order.setNetNumber(order.getNetNumber().substring(0,1)+"****"+split[1]);
}
if(StringUtils.isNotBlank(order.getContactNumber())&&order.getContactNumber().length()==11){
order.setContactNumber(order.getContactNumber().substring(0,3)+"****"+order.getContactNumber().substring(7,11));
}
return ResponseData.success(order);
}catch (Exception e){
e.getMessage();
return ResponseData.error("");
} }
return ResponseData.success(order);
} }
/** /**
...@@ -108,9 +122,22 @@ public class ChooseController { ...@@ -108,9 +122,22 @@ public class ChooseController {
* 查询订单历史状态 * 查询订单历史状态
*/ */
@RequestMapping(value = "selectOrderHis", method = RequestMethod.POST) @RequestMapping(value = "selectOrderHis", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam("orderId") String orderId) { public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam(value = "orderId",required = false) String orderId,@RequestParam(value = "orderSeq",required = false) String orderSeq) {
List<Map<String, Object>> list = appMapper.selectOrderHis(orderId); try{
return ResponseData.success(list); if(StringUtils.isNotBlank(orderSeq)){
Wrapper<Order> wrapper2 = new EntityWrapper<>();
wrapper2.eq(StringUtils.isNotBlank(orderSeq),"kd_order",orderSeq);
List<Order> order = orderMapper.selectList(wrapper2);
if(order.size()>0){
orderId = order.get(0).getOrderId();
}
}
List<Map<String, Object>> list = appMapper.selectOrderHis(orderId);
return ResponseData.success(list);
}catch (Exception e){
e.getMessage();
return ResponseData.error("");
}
} }
/** /**
......
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