Merge remote-tracking branch 'origin/jd_dev' into jd_dev

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/http/sms/BulksmsHttp.java

@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.http.core.Request;
 import cn.iocoder.yudao.framework.http.core.Response;
 import cn.iocoder.yudao.framework.http.util.HttpUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -46,7 +45,6 @@ public class BulksmsHttp {
      * @param password   密码
      * @return 参数映射
      */
-    @NotNull
     public Map<String, Object> setParams(String mobiles, String message, String senderName, String username, String password) {
         Map<String, Object> param = new HashMap<>();
         param.put("username", username);

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/http/sms/SendChampHttp.java

@@ -52,7 +52,6 @@ public class SendChampHttp {
      * @param apiKey SendChamp API密钥
      * @return 返回构造好的请求头Map对象
      */
-    @NotNull
     public Map<String, String> setHeader(String apiKey) {
         Map<String, String> header = new HashMap<>();
         header.put("Accept", "application/json,text/plain,*/*");

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java

@@ -581,7 +581,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
         if (result == ApprovalResultStatusEnum.reject.getValue()) {
             LambdaUpdateWrapper<OrderFeeApplicationDO> lambdaUpdateWrapper = new LambdaUpdateWrapper();
             lambdaUpdateWrapper.eq(OrderFeeApplicationDO::getOrderId, orderApprovalDO.getOrderId());
-            lambdaUpdateWrapper.eq(OrderFeeApplicationDO::getBatchBpmBusinessId, orderApprovalDO.getOrderApprovalId());
+            lambdaUpdateWrapper.eq(OrderFeeApplicationDO::getBatchBpmBusinessId, orderApprovalDO.getFormId());
             lambdaUpdateWrapper.set(OrderFeeApplicationDO::getStatus, ApprovalResultStatusEnum.reject.getValue());
             this.update(lambdaUpdateWrapper);
             orderService.updateStatus(orderApprovalDO.getOrderId(), null, null, null, null, null, 0, OrderApprovalTypeResultEnum.expense_apply_reject.getDesc());
@@ -590,7 +590,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
         if (result == ApprovalResultStatusEnum.cancel.getValue()) {
             LambdaQueryWrapper<OrderFeeApplicationDO> lambdaQueryWrapper = new LambdaQueryWrapper();
             lambdaQueryWrapper.eq(OrderFeeApplicationDO::getOrderId, orderApprovalDO.getOrderId());
-            lambdaQueryWrapper.eq(OrderFeeApplicationDO::getBatchBpmBusinessId, orderApprovalDO.getOrderApprovalId());
+            lambdaQueryWrapper.eq(OrderFeeApplicationDO::getBatchBpmBusinessId, orderApprovalDO.getFormId());
             this.remove(lambdaQueryWrapper);
             orderService.updateStatus(orderApprovalDO.getOrderId(), null, null, null, null, null, 0, OrderApprovalTypeResultEnum.expense_apply_cancel.getDesc());
         }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dal/mysql/BoxApprovalMapper.java

@@ -57,7 +57,7 @@ public interface BoxApprovalMapper extends AbstractMapper<BoxApprovalDO> {
             "from ecw_box_approval a",
             "where ",
             "a.shipment_id = #{shipmentId}",
-            "a.status = 0",
+            "and a.approval_status = 0",
             "and (a.order_id is null or (a.order_id is not null and a.order_id = #{orderId}) )",
             "order by a.id desc",
             "</script>"

yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImpl.java

@@ -387,10 +387,9 @@ public class SmsSendServiceImpl implements SmsSendService {
             throw exception(SMS_CHANNEL_NOT_EXISTS);
         }
         //根据debug配置决定是否发送短信
-//        if ((Objects.isNull(businessProperties) || !businessProperties.isDebug()) && smsChannel.getStatus() == 0) {
-//            smsProducer.sendSmsSendMessageV2(smsSendMessage);
-//        }
-        smsProducer.sendSmsSendMessageV2(smsSendMessage);
+        if ((Objects.isNull(businessProperties) || !businessProperties.isDebug()) && smsChannel.getStatus() == 0) {
+            smsProducer.sendSmsSendMessageV2(smsSendMessage);
+        }
         return sendLogId;
     }