修改快跑者创建订单接口，修改商品排序接口，修改管理端封禁店铺接口，打印自动取消订单接口的异常栈

src/main/java/com/sqx/modules/callBack/controller/CallBackController.java

@@ -284,6 +284,7 @@ public class CallBackController {
         if (ObjectUtils.isNotEmpty(remark)) {
             try {
                 remark=remark.replaceAll("\\r\\n|\\n|\\r", " ");
+                remark=remark.replaceAll("\\\\", " ");
                 remark = URLEncoder.encode(remark, "UTF-8");
             } catch (UnsupportedEncodingException e) {
                 throw new RuntimeException(e);
@@ -431,7 +432,7 @@ public class CallBackController {
         String remark2 = tbOrder.getRemark();
         if (ObjectUtils.isNotEmpty(remark2)) {
             remark2=remark2.replaceAll("\\r\\n|\\n|\\r", " ");
-
+            remark2=remark2.replaceAll("\\\\", " ");
             // 方法2：使用Java 8+的\\R正则表达式;
         }
         body2.put("order_note", remark2);

src/main/java/com/sqx/modules/errand/service/impl/TbIndentServiceImpl.java

@@ -488,6 +488,7 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         if (ObjectUtils.isNotEmpty(remark)) {
             try {
                 remark=remark.replaceAll("\\r\\n|\\n|\\r", " ");
+                remark=remark.replaceAll("\\\\", " ");
                 remark = URLEncoder.encode(remark, "UTF-8");
             } catch (UnsupportedEncodingException e) {
                 throw new RuntimeException(e);
@@ -635,7 +636,7 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         String remark2 = tbOrder.getRemark();
         if (ObjectUtils.isNotEmpty(remark2)) {
             remark2=remark2.replaceAll("\\r\\n|\\n|\\r", " ");
-
+            remark2=remark2.replaceAll("\\\\", " ");
             // 方法2：使用Java 8+的\\R正则表达式;
         }
         body2.put("order_note", remark2);

src/main/java/com/sqx/modules/goods/service/impl/GoodsShopServiceImpl.java

@@ -272,9 +272,12 @@ public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopDao, GoodsShop> i
         //更新商户号、snCode、打印机参数为空设置为null
         baseMapper.update(goodsShop,Wrappers.<GoodsShop>lambdaUpdate()
                 .eq(GoodsShop::getShopId,goodsShop.getShopId())
-                .set(GoodsShop::getMchId , StringUtils.isEmpty(goodsShop.getMchId())?null:goodsShop.getMchId())
-                .set(GoodsShop::getSnCode , StringUtils.isEmpty(goodsShop.getSnCode())?null:goodsShop.getSnCode())
-                .set(GoodsShop::getValue , StringUtils.isEmpty(goodsShop.getValue())?null:goodsShop.getValue()));
+                .set(StringUtils.isNotEmpty(goodsShop.getMchId()),GoodsShop::getMchId , goodsShop.getMchId())
+                .set(StringUtils.isNotEmpty(goodsShop.getSnCode()),GoodsShop::getSnCode , goodsShop.getSnCode())
+                .set(StringUtils.isNotEmpty(goodsShop.getValue()),GoodsShop::getValue , goodsShop.getValue()));
+//                .set(GoodsShop::getMchId , StringUtils.isEmpty(goodsShop.getMchId())?null:goodsShop.getMchId())
+//                .set(GoodsShop::getSnCode , StringUtils.isEmpty(goodsShop.getSnCode())?null:goodsShop.getSnCode())
+//                .set(GoodsShop::getValue , StringUtils.isEmpty(goodsShop.getValue())?null:goodsShop.getValue()));
         //snCode value
 //        if(StringUtils.isEmpty(goodsShop.getSnCode())){
 //            baseMapper.update(null, Wrappers.<GoodsShop>lambdaUpdate()

src/main/java/com/sqx/scheduler/order/OrderScheduler.java

@@ -304,6 +304,7 @@ public class OrderScheduler {
             log.info("超时订单自动取消运行成功");
         } catch (Exception e) {
             log.error("超时订单自动取消任务运行失败失败原因：{}", e.getMessage());
+            e.printStackTrace();
         } finally {
             lock.unlock();
         }

src/main/resources/mapper/goods/GoodsMapper.xml

@@ -99,7 +99,7 @@
         where gsr.shop_id = #{shopId}
           and g.classify_id = #{classifyId}
           and g.status = 0
-        order by g.sort asc
+        order by LPAD(g.sort, 10, '0') ASC
     </select>
 
     <select id="selectGoodsBySales" resultType="com.sqx.modules.goods.entity.Goods">
@@ -211,7 +211,7 @@
         where gsr.shop_id = #{shopId}
           and g.classify_id = #{classifyId}
           and g.status = 0
-        order by g.sort asc
+        order by LPAD(g.sort, 10, '0') ASC
     </select>
     <select id="selectSupermarketGoodsList" resultType="com.sqx.modules.goods.entity.Goods">
         select g.*, gsr.sales as sales, gsr.inventory as inventory, ga.activityList
@@ -236,7 +236,7 @@
         where gsr.shop_id = #{shopId}
           and g.classify_id = #{classifyId}
           and g.status = 0
-        order by g.sort asc
+        order by LPAD(g.sort, 10, '0') ASC
     </select>
 
 </mapper>

src/main/resources/mapper/goods/GoodsShopMapper.xml

@@ -92,7 +92,7 @@
                 AND gsr.inventory = 0
             </if>
         </if>
-        order by g.sort asc,gsr.create_time desc
+        order by LPAD(g.sort, 10, '0') ASC,gsr.create_time desc
     </select>