|
|
@@ -737,10 +737,8 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
|
|
|
String shopTemplate = commonInfoService.findOne(354).getValue();
|
|
|
List<String> msgListShop = new ArrayList<>();
|
|
|
msgListShop.add(tbIndent.getIndentNumber());
|
|
|
- log.error("打印：" + tbIndent.getIndentNumber());
|
|
|
msgListShop.add("骑手接单");
|
|
|
msgListShop.add(DateUtils.format(new Date()));
|
|
|
- log.error("打印：" + msgListShop.toString());
|
|
|
GoodsShop goodsShop = goodsShopDao.selectById(order.getShopId());
|
|
|
UserEntity shopUser = userService.selectUserById(goodsShop.getUserId());
|
|
|
|
|
|
@@ -1199,7 +1197,6 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
|
|
|
public Result riderDelivery(Long userId, RiderDeliveryDTO deliveryDTO) {
|
|
|
// 添加拍照发短信逻辑
|
|
|
// 因为原有的确认送达方法代码比较凌乱，且不好重新封装，所以这里就在原有确认收货方法之前添加拍照发短信逻辑
|
|
|
-
|
|
|
String indentNumber = deliveryDTO.getIndentNumber();
|
|
|
TbIndent indentOrder = tbIndentDao.findIndentByNumber(indentNumber);
|
|
|
if (ObjectUtil.isNull(indentOrder)) {
|
codingliang