|
|
@@ -172,6 +172,7 @@ public class CallBackController {
|
|
|
|
|
|
@GetMapping("/open/test")
|
|
|
public Result test(String orderNumber){
|
|
|
+ log.info("订单号:{}",orderNumber);
|
|
|
TbOrder order = appOrderService.getOne(new QueryWrapper<TbOrder>().eq("order_number", orderNumber));
|
|
|
|
|
|
log.info("第一次创建快跑者订单");
|
|
|
@@ -209,11 +210,23 @@ public class CallBackController {
|
|
|
}
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
- StringBuilder append = new StringBuilder().append("爆料鸡排\t(藤椒风味酱-香辣花生撒粉)约120克介意慎拍");
|
|
|
- String s1= append.toString().replaceAll("\\t", " ");
|
|
|
- String s="爆料鸡排\t(藤椒风味酱-香辣花生撒粉)约120克介意慎拍".replaceAll("\\t", " ");
|
|
|
- System.out.println("s = " + s);
|
|
|
- System.out.println("append = " + s1);
|
|
|
+// StringBuilder append = new StringBuilder().append("爆料鸡排\t(藤椒风味酱-香辣花生撒粉)约120克介意慎拍");
|
|
|
+// String s1= append.toString().replaceAll("\\t", " ");
|
|
|
+// String s="爆料鸡排\t(藤椒风味酱-香辣花生撒粉)约120克介意慎拍".replaceAll("\\t", " ");
|
|
|
+// System.out.println("s = " + s);
|
|
|
+// System.out.println("append = " + s1);
|
|
|
+ String remark="素:土豆,方便面,金针菇,荤:肉\t\n" +
|
|
|
+ "饼,鸡排,荷包蛋,波波肠";
|
|
|
+ System.out.println("remark = " + remark);
|
|
|
+ remark=remark.replaceAll("\\r\\n|\\n|\\r", " ");
|
|
|
+ remark=remark.replaceAll("\\\\", " ");
|
|
|
+ System.out.println("remark = " + remark);
|
|
|
+ try {
|
|
|
+ remark = URLEncoder.encode(remark, "UTF-8");
|
|
|
+ System.out.println("remark = " + remark);
|
|
|
+ } catch (UnsupportedEncodingException e) {
|
|
|
+ throw new RuntimeException(e);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public String creatSpeedRunnerOrder(TbOrder tbOrder){
|
|
|
@@ -313,7 +326,7 @@ public class CallBackController {
|
|
|
String remark = tbOrder.getRemark();
|
|
|
if (ObjectUtils.isNotEmpty(remark)) {
|
|
|
try {
|
|
|
- remark=remark.replaceAll("\\r\\n|\\n|\\r", " ");
|
|
|
+ remark=remark.replaceAll("\\r\\n|\\n|\\r|\\t", " ");
|
|
|
remark=remark.replaceAll("\\\\", " ");
|
|
|
remark = URLEncoder.encode(remark, "UTF-8");
|
|
|
} catch (UnsupportedEncodingException e) {
|
|
|
@@ -351,7 +364,7 @@ public class CallBackController {
|
|
|
String userName = address.getUserName();
|
|
|
if (ObjectUtils.isNotEmpty(userName)) {
|
|
|
try {
|
|
|
- userName=userName.replaceAll("\\r\\n|\\n|\\r", " ");
|
|
|
+ userName=userName.replaceAll("\\r\\n|\\n|\\r|\\t", " ");
|
|
|
userName = URLEncoder.encode(userName, "UTF-8");
|
|
|
} catch (UnsupportedEncodingException e) {
|
|
|
throw new RuntimeException(e);
|
|
|
@@ -464,7 +477,7 @@ public class CallBackController {
|
|
|
|
|
|
String remark2 = tbOrder.getRemark();
|
|
|
if (ObjectUtils.isNotEmpty(remark2)) {
|
|
|
- remark2=remark2.replaceAll("\\r\\n|\\n|\\r", " ");
|
|
|
+ remark2=remark2.replaceAll("\\r\\n|\\n|\\r|\\t", " ");
|
|
|
remark2=remark2.replaceAll("\\\\", " ");
|
|
|
// 方法2:使用Java 8+的\\R正则表达式;
|
|
|
}
|
|
|
@@ -485,7 +498,7 @@ public class CallBackController {
|
|
|
// String userName = address.getUserName();
|
|
|
String userName1 = address.getUserName();
|
|
|
if (ObjectUtils.isNotEmpty(userName1)) {
|
|
|
- userName1=userName1.replaceAll("\\r\\n|\\n|\\r", " ");
|
|
|
+ userName1=userName1.replaceAll("\\r\\n|\\n|\\r|\\t", " ");
|
|
|
}
|
|
|
body2.put("customer_name", userName1);
|
|
|
|