|
@@ -1092,7 +1092,9 @@ public class TOrderController {
|
|
altInfo.add(agencyJson);
|
|
altInfo.add(agencyJson);
|
|
break;
|
|
break;
|
|
case 1:
|
|
case 1:
|
|
- agencyMch = R.getDataIfSuccess(szwlFeign.getMch(String.valueOf(proportion.getAgencyId())));
|
|
|
|
|
|
+// agencyMch = R.getDataIfSuccess(szwlFeign.getMch(String.valueOf(proportion.getAgencyId())));
|
|
|
|
+ ResponseModel<TJoinpayMch> mch = szwlFeign.getMch(String.valueOf(proportion.getAgencyId()));
|
|
|
|
+ agencyMch=mch.getData();
|
|
|
|
|
|
// agencyMch = mchService.getUniqueness(admin.getAgencyId());
|
|
// agencyMch = mchService.getUniqueness(admin.getAgencyId());
|
|
selfMch = R.getDataIfSuccess(szwlFeign.getMch(String.valueOf(proportion.getAdminId())));
|
|
selfMch = R.getDataIfSuccess(szwlFeign.getMch(String.valueOf(proportion.getAdminId())));
|
|
@@ -2499,6 +2501,9 @@ public class TOrderController {
|
|
String sn = request.getParameter("r2_OrderNo");
|
|
String sn = request.getParameter("r2_OrderNo");
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
query.eq(TOrder::getSn,sn);
|
|
query.eq(TOrder::getSn,sn);
|
|
|
|
+ if(StringUtils.isEmpty(sn)){
|
|
|
|
+ return "error";
|
|
|
|
+ }
|
|
List<TOrder> list = orderService.list(query);
|
|
List<TOrder> list = orderService.list(query);
|
|
TOrder order = new TOrder();
|
|
TOrder order = new TOrder();
|
|
if(list.size()>0){
|
|
if(list.size()>0){
|
|
@@ -2530,8 +2535,6 @@ public class TOrderController {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
orderService.updateById(order);
|
|
orderService.updateById(order);
|
|
- //传送数据
|
|
|
|
- sentJingZhun(order);
|
|
|
|
JSONObject kindData = new JSONObject();
|
|
JSONObject kindData = new JSONObject();
|
|
kindData.put("sn", order.getSn());
|
|
kindData.put("sn", order.getSn());
|
|
kindData.put("productName", order.getProductName());
|
|
kindData.put("productName", order.getProductName());
|
|
@@ -2549,6 +2552,12 @@ public class TOrderController {
|
|
kindData1.put("mealCode", s);
|
|
kindData1.put("mealCode", s);
|
|
order.setOrderStatus("0");
|
|
order.setOrderStatus("0");
|
|
equipmentService.sentMessage(byClientId.getClientId(), PushUtils.buildJson("cardPayXCX", kindData1.toString()).toString());
|
|
equipmentService.sentMessage(byClientId.getClientId(), PushUtils.buildJson("cardPayXCX", kindData1.toString()).toString());
|
|
|
|
+ if(StringUtils.isNotEmpty(byClientId.getApkVersion())){
|
|
|
|
+ //发送两次mq
|
|
|
|
+ if(byClientId.getApkVersion().equals("1.0.131-jz11")||byClientId.getApkVersion().equals("1.0.131-jz12")||byClientId.getApkVersion().equals("1.0.131-jz13")){
|
|
|
|
+ sendMqTwo(byClientId.getClientId(),kindData1.toString());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
TSzsmWx szsmWx = szsmWxService.getById(order.getWxId());
|
|
TSzsmWx szsmWx = szsmWxService.getById(order.getWxId());
|
|
BigDecimal integral = szsmWx.getIntegral();
|
|
BigDecimal integral = szsmWx.getIntegral();
|
|
if(integral!=null){
|
|
if(integral!=null){
|
|
@@ -2573,9 +2582,11 @@ public class TOrderController {
|
|
}
|
|
}
|
|
// PushUtils.push(gtClientId, "支付成功", "您的订单支付成功", PushUtils.buildJson("pay_success", kindData.toString()).toString());
|
|
// PushUtils.push(gtClientId, "支付成功", "您的订单支付成功", PushUtils.buildJson("pay_success", kindData.toString()).toString());
|
|
// order.setNote(gtClientId + "已推送");
|
|
// order.setNote(gtClientId + "已推送");
|
|
|
|
+ orderService.updateById(order);
|
|
|
|
+ //传送数据
|
|
|
|
+ sentJingZhun(order);
|
|
try {
|
|
try {
|
|
esTOrderService.insertData(order);
|
|
esTOrderService.insertData(order);
|
|
- orderService.updateById(order);
|
|
|
|
}catch (Exception e) {
|
|
}catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
@@ -2593,7 +2604,37 @@ public class TOrderController {
|
|
|
|
|
|
return "success";
|
|
return "success";
|
|
}
|
|
}
|
|
-// @RequestMapping(value = "/sentJingZhun", method = RequestMethod.POST)
|
|
|
|
|
|
+ //发送两次mq
|
|
|
|
+ private void sendMqTwo(String clientId, String kind) {
|
|
|
|
+ // 定时任务1
|
|
|
|
+ TimerTask timerTask = new TimerTask() {
|
|
|
|
+ @Override
|
|
|
|
+ public void run() {
|
|
|
|
+ equipmentService.sentMessage(clientId, PushUtils.buildJson("cardPayXCX", kind).toString());
|
|
|
|
+ System.out.println("运行定时任务1:" + clientId);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ };
|
|
|
|
+ // 定时任务2
|
|
|
|
+ TimerTask timerTask1 = new TimerTask() {
|
|
|
|
+ @Override
|
|
|
|
+ public void run() {
|
|
|
|
+ equipmentService.sentMessage(clientId, PushUtils.buildJson("cardPayXCX", kind).toString());
|
|
|
|
+ System.out.println("运行定时任务1:" + clientId);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ };
|
|
|
|
+ // 计时器
|
|
|
|
+ Timer timer = new Timer();
|
|
|
|
+ // 添加执行任务(延迟 5s 执行)
|
|
|
|
+ timer.schedule(timerTask, 5000);
|
|
|
|
+ Timer timer1 = new Timer();
|
|
|
|
+ timer1.schedule(timerTask1, 10000);
|
|
|
|
+// equipmentService.sentMessage(clientId, PushUtils.buildJson("cardPayXCX", kind).toString());
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // @RequestMapping(value = "/sentJingZhun", method = RequestMethod.POST)
|
|
// @ResponseBody
|
|
// @ResponseBody
|
|
private void sentJingZhun( TOrder order) {
|
|
private void sentJingZhun( TOrder order) {
|
|
order = orderService.getById(order.getId());
|
|
order = orderService.getById(order.getId());
|
|
@@ -2612,7 +2653,12 @@ public class TOrderController {
|
|
TSzsmWx szsmWx = szsmWxService.getById(order.getWxId());
|
|
TSzsmWx szsmWx = szsmWxService.getById(order.getWxId());
|
|
map.put("sourceChannel","1");
|
|
map.put("sourceChannel","1");
|
|
map.put("phone",szsmWx.getPhone());
|
|
map.put("phone",szsmWx.getPhone());
|
|
- map.put("amount",order.getMarketingAmount().toString());
|
|
|
|
|
|
+ if(order.getMarketingAmount()!=null){
|
|
|
|
+ map.put("amount",order.getMarketingAmount().toString());
|
|
|
|
+ }else{
|
|
|
|
+ map.put("amount","0");
|
|
|
|
+ }
|
|
|
|
+
|
|
map.put("nickName","1");
|
|
map.put("nickName","1");
|
|
map.put("uninoId",szsmWx.getOpenId());
|
|
map.put("uninoId",szsmWx.getOpenId());
|
|
}else {
|
|
}else {
|
|
@@ -2651,7 +2697,10 @@ public class TOrderController {
|
|
String r6_Status = request.getParameter("r6_Status");
|
|
String r6_Status = request.getParameter("r6_Status");
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
query.eq(TOrder::getSn,order_no);
|
|
query.eq(TOrder::getSn,order_no);
|
|
- List<TOrder> list = orderService.list();
|
|
|
|
|
|
+ if(StringUtils.isEmpty(order_no)){
|
|
|
|
+ return "error";
|
|
|
|
+ }
|
|
|
|
+ List<TOrder> list =orderService.list(query);
|
|
TOrder order = new TOrder();
|
|
TOrder order = new TOrder();
|
|
if(list.size()>0){
|
|
if(list.size()>0){
|
|
order = list.get(0);
|
|
order = list.get(0);
|
|
@@ -2800,8 +2849,11 @@ public class TOrderController {
|
|
String sn = request.getParameter("r2_OrderNo");
|
|
String sn = request.getParameter("r2_OrderNo");
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
query.eq(TOrder::getSn,sn);
|
|
query.eq(TOrder::getSn,sn);
|
|
- List<TOrder> list = orderService.list();
|
|
|
|
- TOrder order = new TOrder();
|
|
|
|
|
|
+ if(StringUtils.isEmpty(sn)){
|
|
|
|
+ return "error";
|
|
|
|
+ }
|
|
|
|
+ List<TOrder> list = orderService.list(query);
|
|
|
|
+ TOrder order = list.get(0);
|
|
|
|
|
|
|
|
|
|
if (JoinpayConstant.r6_Status_100.equals(r6_Status)) {
|
|
if (JoinpayConstant.r6_Status_100.equals(r6_Status)) {
|
|
@@ -2960,6 +3012,9 @@ public class TOrderController {
|
|
String sn = request.getParameter("r2_OrderNo");
|
|
String sn = request.getParameter("r2_OrderNo");
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
query.eq(TOrder::getSn,sn);
|
|
query.eq(TOrder::getSn,sn);
|
|
|
|
+ if(StringUtils.isEmpty(sn)){
|
|
|
|
+ return "error";
|
|
|
|
+ }
|
|
List<TOrder> list = orderService.list(query);
|
|
List<TOrder> list = orderService.list(query);
|
|
TOrder order = list.get(0);
|
|
TOrder order = list.get(0);
|
|
if (order == null) {
|
|
if (order == null) {
|
|
@@ -3075,7 +3130,11 @@ public class TOrderController {
|
|
int number = (int) num;
|
|
int number = (int) num;
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
query.eq(TOrder::getSn,sn);
|
|
query.eq(TOrder::getSn,sn);
|
|
- List<TOrder> list = orderService.list();
|
|
|
|
|
|
+ List<TOrder> list = new ArrayList<>();
|
|
|
|
+ if(StringUtils.isNotEmpty(sn)){
|
|
|
|
+ list = orderService.list(query);
|
|
|
|
+ }
|
|
|
|
+
|
|
TOrder order = list.get(0);
|
|
TOrder order = list.get(0);
|
|
if (order.getStatus() != 0) {
|
|
if (order.getStatus() != 0) {
|
|
return "success";
|
|
return "success";
|
|
@@ -3104,7 +3163,7 @@ public class TOrderController {
|
|
}
|
|
}
|
|
|
|
|
|
orderService.updateById(order);
|
|
orderService.updateById(order);
|
|
- TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(order.getAdminId())));
|
|
|
|
|
|
+// TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(order.getAdminId())));
|
|
JSONObject kindData = new JSONObject();
|
|
JSONObject kindData = new JSONObject();
|
|
kindData.put("sn", order.getSn());
|
|
kindData.put("sn", order.getSn());
|
|
kindData.put("productName", order.getProductName());
|
|
kindData.put("productName", order.getProductName());
|
|
@@ -3206,6 +3265,8 @@ public class TOrderController {
|
|
@RequestMapping(value = "/deleteOrder", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/deleteOrder", method = RequestMethod.GET)
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public JsonMessage deleteOrder(String sn) {
|
|
public JsonMessage deleteOrder(String sn) {
|
|
|
|
+ if(StringUtils.isEmpty(sn)){
|
|
|
|
+ return JsonMessage.error(sn + "删除失败"); }
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
|
|
query.eq(TOrder::getSn,sn);
|
|
query.eq(TOrder::getSn,sn);
|
|
List<TOrder> list = orderService.list(query);
|
|
List<TOrder> list = orderService.list(query);
|