扫码

src/main/java/com/sqx/modules/errand/controller/app/AppTbIndentController.java

@@ -393,7 +393,7 @@ public class AppTbIndentController {
         if (datas.getTotalCount() == 1) {
             //校验当前骑手是否能接单
             Result checkData = tbIndentService.checkIndent(userId, acquireCode);
-            if(!checkData.get("code").equals("0")){
+            if((int)checkData.get("code") != 0){
                 return Result.error("当前订单无法接单");
             }
         }
@@ -421,6 +421,13 @@ public class AppTbIndentController {
         return tbIndentService.orderRiderDelivery(userId, orderRiderDeliveryDTO);
     }
     //endregion
+
+    //region 取货
+
+    //endregion
+
+    //region 转单
+    //endregion
     //endregion
 
 }

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

@@ -769,13 +769,11 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
                 }
                 TbIndent tbIndent = tbIndentDao.findIndentByOrderId(acquireCode);
                 log.error("抢单："+userId+"     "+tbIndent.getIndentState());
-                if(!"2".equals(tbIndent.getIndentState())){
-                    return Result.error("订单已被抢走！");
-                }
-                if("4".equals(tbIndent.getIndentType())){
+//                if(!"2".equals(tbIndent.getIndentState())){
+//                    return Result.error("订单已被抢走！");
+//                }
+                if("2".equals(tbIndent.getIndentType()) || "3".equals(tbIndent.getIndentType())){
                     tbIndentDao.orderIndentReceiv(userId, acquireCode, format,"4");
-                }else {
-                    tbIndentDao.orderIndentReceiving(userId, acquireCode, format);
                 }
                 //消息推送（以前写的在下面放着）
                 CommonInfo five = commonInfoService.findOne(310);
@@ -968,9 +966,9 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         }
 
         Long smsTemplateId = deliveryDTO.getSmsTemplateId();
-        String imgs = deliveryDTO.getImgs();
-        if (ObjectUtil.isNull(smsTemplateId) || StrUtil.isBlank(imgs)) {
-            throw new SqxException("短信模板id或图片不能为空");
+        //String imgs = deliveryDTO.getImgs();
+        if (ObjectUtil.isNull(smsTemplateId)) {
+            throw new SqxException("短信模板id不能为空");
         }
 
         // 收货人手机
@@ -989,9 +987,9 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         }
 
         // 订单新增送达图片
-        TbOrder tbOrder = appOrderService.getById(indentOrder.getOrderId());
-        tbOrder.setDeliveryImgs(imgs);
-        appOrderService.updateById(tbOrder);
+//        TbOrder tbOrder = appOrderService.getById(indentOrder.getOrderId());
+//        tbOrder.setDeliveryImgs(imgs);
+//        appOrderService.updateById(tbOrder);
 
         // 发送短信并记录短信发送记录
         SmsSendResult smsSendResult = smsTemplateService.sendSms(smsTemplateId, riderUser, userPhone);
@@ -1668,9 +1666,14 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
 
     @Override
     public PageUtils selectIndentPage(Integer page, Integer limit, String acquireCode) {
+        List<Integer> states = new ArrayList<>();
+        states.add(2);
+        states.add(3);
+        states.add(4);
         IPage<TbIndent> pages = new Page<>(page, limit);
         QueryWrapper<TbIndent> queryWrapper = new QueryWrapper();
         queryWrapper.like(org.springframework.util.StringUtils.hasText(acquireCode), "order_id", acquireCode);
+        queryWrapper.in("indent_state",states);
         queryWrapper.orderByAsc("create_time");
         IPage<TbIndent> result = baseMapper.selectPage(pages, queryWrapper);
 
@@ -1701,7 +1704,7 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
                 }
                 TbIndent tbIndent = tbIndentDao.findIndentByOrderId(orderId);
                 log.error("抢单："+userId+"     "+tbIndent.getIndentState());
-                if(!"2".equals(tbIndent.getIndentState())){
+                if(!"2".equals(tbIndent.getIndentState()) && tbIndent.getOrderId().intValue() != Integer.valueOf(orderId).intValue()){
                     return Result.error("订单已被抢走！");
                 }
             }else {

src/main/java/com/sqx/modules/utils/fieYun/FeiYunUtils.java

@@ -1618,6 +1618,8 @@ public class FeiYunUtils {
             sb.append(tbOrder.getShopName()+"<BR>");
             sb.append("订单号：").append(tbOrder.getOrderNumber()).append("<BR>");
             sb.append("类型：").append(eOrderTypeExtra.stringOf(tbOrder.getOrderTypeExtra())).append("<BR>");
+            sb.append("<BR>");
+            sb.append("<CUT>");
 
 //            String returnNo = getDigitBarCode(tbOrder.getOrderNumber());
 //            //sb.append("<BC128_C>"+returnNo+"</BC128_C>");

src/main/resources/mapper/errand/TbIndentMapper.xml

@@ -182,7 +182,7 @@
 
     <update id="orderIndentReceiving">
         update tb_indent
-        set indent_state   = 3,
+        set indent_state   = 4,
             rider_user_id  = #{userId},
             receiving_time = #{format}
         where order_id = #{orderId}