From 6b6dea66dc53ebee26ac5e6731d8e7f0bd6a9fe2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 22 八月 2025 20:57:59 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/service/business/AliSmsService.java |  118 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/AliSmsService.java b/server/services/src/main/java/com/doumee/service/business/AliSmsService.java
index 71625fb..255d7da 100644
--- a/server/services/src/main/java/com/doumee/service/business/AliSmsService.java
+++ b/server/services/src/main/java/com/doumee/service/business/AliSmsService.java
@@ -46,72 +46,74 @@
     private final static String SING_NAME = "姗欐澶╀笅绉戞妧";
 
 
-    public void sendSms(int type, String phone, Orders orders, String receiveName, String businessPhone, BigDecimal distance, IdentityInfo identityInfo,CategoryMapper categoryMapper){
-        Constants.smsContent smsContent = Constants.smsContent.getSmsContent(type);
-        Map<String,Object> tempParam = new HashMap<>();
-        if(smsContent.getName().indexOf("time1")>=Constants.ZERO){
-            tempParam.put("time1", DateUtil.formatDate(orders.getStartDate(),"MM-dd"));
-        }
-        if(smsContent.getName().indexOf("time2")>=Constants.ZERO){
-            tempParam.put("time2", DateUtil.formatDate(orders.getEndDate(),"MM-dd"));
-        }
-        if(smsContent.getName().indexOf("name")>=Constants.ZERO){
-            tempParam.put("name", receiveName);
-        }
-        if(smsContent.getName().indexOf("money")>=Constants.ZERO){
-            tempParam.put("money", new BigDecimal(orders.getReceiveAccount().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP)+"鍏�");
-        }
-        if(smsContent.getName().indexOf("distance")>=Constants.ZERO){
-            tempParam.put("distance", distance +"km");
-        }
-        //璁よ瘉鐭俊 鐗规畩澶勭悊
-        if(Constants.equalsInteger(smsContent.getKey(),Constants.smsContent.authentication.getKey())){
-            //璁よ瘉绫诲瀷
-            if(smsContent.getName().indexOf("authentication")>=Constants.ZERO){
-                tempParam.put("authentication", Constants.equalsInteger(identityInfo.getAuthType(),Constants.ZERO)?"涓汉":identityInfo.getCompanyName());
+    public void businessSendSms(int type, String phone, Orders orders, BigDecimal distance,
+                        IdentityInfo identityInfo,CategoryMapper categoryMapper){
+        try{
+            Constants.smsContent smsContent = Constants.smsContent.getSmsContent(type);
+            Map<String,Object> tempParam = new HashMap<>();
+            if(smsContent.getName().indexOf("time1")>=Constants.ZERO){
+                tempParam.put("time1", DateUtil.formatDate(orders.getStartDate(),"MM-dd"));
             }
-            if(smsContent.getName().indexOf("order")>=Constants.ZERO){
-                tempParam.put("order", Constants.orderType.getName(identityInfo.getType()).replace("鍗�",""));
+            if(smsContent.getName().indexOf("time2")>=Constants.ZERO){
+                tempParam.put("time2", DateUtil.formatDate(orders.getEndDate(),"MM-dd"));
             }
-            if(smsContent.getName().indexOf("status")>=Constants.ZERO){
-                tempParam.put("status", Constants.equalsInteger(identityInfo.getAuditStatus(),Constants.TWO)?"宸查�氳繃":"鏈�氳繃");
+            if(smsContent.getName().indexOf("money")>=Constants.ZERO){
+                tempParam.put("money", new BigDecimal(orders.getReceiveAccount().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP)+"鍏�");
             }
-        }else{
-            if(smsContent.getName().indexOf("order")>=Constants.ZERO){
-                String order = "";
-                //鏌ヨ璁㈠崟鐨勭被鍨嬩俊鎭�
-                if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
-                    order = Constants.workType.getName(orders.getWorkType());
-                    Category category = categoryMapper.selectById(orders.getCategoryId());
-                    if(Objects.nonNull(category)){
-                        order = category.getName() + order;
-                    }
-                }else if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
-                    order = "杩愯緭";
-                    Category category = categoryMapper.selectById(orders.getTransportTypeId());
-                    if(Objects.nonNull(category)){
-                        order = category.getName() + order;
-                    }
-                }else{
-                    List<CateringDTO> cateringDTOList = JSONArray.parseArray(orders.getWayInfo(),CateringDTO.class);
-                    if(CollectionUtils.isNotEmpty(cateringDTOList)){
-                        for (CateringDTO cateringDTO:cateringDTOList) {
-                            if(StringUtils.isBlank(order)){
-                                order = cateringDTO.getName();
-                            }else{
-                                order = order + "/" +cateringDTO.getName();
+            if(smsContent.getName().indexOf("distance")>=Constants.ZERO){
+                tempParam.put("distance", distance +"km");
+            }
+            //璁よ瘉鐭俊 鐗规畩澶勭悊
+            if(Constants.equalsInteger(smsContent.getKey(),Constants.smsContent.authentication.getKey())){
+                //璁よ瘉绫诲瀷
+                if(smsContent.getName().indexOf("authentication")>=Constants.ZERO){
+                    tempParam.put("authentication", Constants.equalsInteger(identityInfo.getAuthType(),Constants.ZERO)?"涓汉":identityInfo.getCompanyName());
+                }
+                if(smsContent.getName().indexOf("order")>=Constants.ZERO){
+                    tempParam.put("oeder", Constants.orderType.getName(identityInfo.getType()).replace("鍗�",""));
+                }
+                if(smsContent.getName().indexOf("status")>=Constants.ZERO){
+                    tempParam.put("status", Constants.equalsInteger(identityInfo.getAuditStatus(),Constants.TWO)?"宸查�氳繃":"鏈�氳繃");
+                }
+            }else{
+                if(smsContent.getName().indexOf("order")>=Constants.ZERO){
+                    String order = "";
+                    //鏌ヨ璁㈠崟鐨勭被鍨嬩俊鎭�
+                    if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
+                        order = Constants.workType.getName(orders.getWorkType());
+                        Category category = categoryMapper.selectById(orders.getCategoryId());
+                        if(Objects.nonNull(category)){
+                            order = category.getName() + order;
+                        }
+                    }else if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
+                        order = "杩愯緭";
+                        Category category = categoryMapper.selectById(orders.getTransportTypeId());
+                        if(Objects.nonNull(category)){
+                            order = category.getName() + order;
+                        }
+                    }else{
+                        List<CateringDTO> cateringDTOList = JSONArray.parseArray(orders.getWayInfo(),CateringDTO.class);
+                        if(CollectionUtils.isNotEmpty(cateringDTOList)){
+                            for (CateringDTO cateringDTO:cateringDTOList) {
+                                if(StringUtils.isBlank(order)){
+                                    order = cateringDTO.getName();
+                                }else{
+                                    order = order + "/" +cateringDTO.getName();
+                                }
                             }
                         }
                     }
+                    tempParam.put("order",order);
                 }
-                tempParam.put("order",order);
             }
+            if(smsContent.getName().indexOf("distance")>=Constants.ZERO){
+                tempParam.put("distance", distance +"km");
+            }
+            AliSmsService.sendSms(phone,smsContent.getCode(), JSONObject.toJSONString(tempParam));
+        }catch (Exception e){
+            log.error("鐭俊鍙戦�佸け璐");
         }
 
-        if(smsContent.getName().indexOf("authentication")>=Constants.ZERO){
-            tempParam.put("distance", distance +"km");
-        }
-        AliSmsService.sendSms(phone,smsContent.getCode(), JSONObject.toJSONString(tempParam));
     }
 
 
@@ -166,10 +168,10 @@
             //璇锋眰澶辫触杩欓噷浼氭姏ClientException寮傚父
             SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
             if (sendSmsResponse.getCode() != null && sendSmsResponse.getCode().equals("OK")) {
-//                logger.info(phone + "-" + templateCode + "-" + templateParam + " >>> " + JSON.toJSONString(sendSmsResponse));
+                log.info("鐭俊鍙戦�佸唴瀹癸細"+phone + "-" + templateCode + "-" + templateParam + " >>> " + JSON.toJSONString(sendSmsResponse));
                 return true;
             } else {
-//                logger.error(phone + "-" + templateCode + "-" + templateParam + " >>> " + JSON.toJSONString(sendSmsResponse));
+                log.error("鐭俊鍙戦�佸唴瀹癸細"+phone + "-" + templateCode + "-" + templateParam + " >>> " + JSON.toJSONString(sendSmsResponse));
             }
         } catch (Exception e) {
             e.printStackTrace();

--
Gitblit v1.9.3