Selaa lähdekoodia

fix:“优化退款短信提醒功能“

soobin 1 vuosi sitten
vanhempi
commit
e3369eb4fc

+ 2 - 3
src/main/java/com/szwl/controller/TOrderController.java

@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.common.aop.LogAnnotation;
-import com.szwl.constant.ConfigConsts;
 import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.feign.SzwlFeign;
 import com.szwl.model.bean.*;
@@ -2044,8 +2043,8 @@ public class TOrderController {
             return R.fail(ResponseCodesEnum.A0001);
         }
         String result = orderService.setMessage(id, customerPhone);
-        if (result.equals(ConfigConsts.SUCCESS)) {
-            return R.ok("发送成功");
+        if ("发送成功".equals(result)) {
+            return R.ok(result);
         } else {
             return R.fail(ResponseCodesEnum.A0001, result);
         }

+ 9 - 9
src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -8,9 +8,10 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.szwl.constant.ConfigConsts;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.szwl.exception.MyException;
 import com.szwl.feign.SzwlFeign;
+import com.szwl.mapper.TOrderMapper;
 import com.szwl.model.bean.ChartBean;
 import com.szwl.model.bean.ChartColumn;
 import com.szwl.model.bean.OrderDaoChuDTO;
@@ -21,7 +22,6 @@ import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TAdminEquipment;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TOrder;
-import com.szwl.mapper.TOrderMapper;
 import com.szwl.model.excel.NewOrderTarget;
 import com.szwl.model.excel.OrderTarget;
 import com.szwl.model.query.OrderDaoChuParam;
@@ -29,7 +29,6 @@ import com.szwl.model.query.OrderStatisticsDTO;
 import com.szwl.model.query.StatisticsParam;
 import com.szwl.model.utils.DateUtils;
 import com.szwl.service.TOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.szwl.util.YunPianSms;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -48,8 +47,6 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * <p>
@@ -239,6 +236,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     @Override
     public String setMessage(Long id, String customerPhone) {
         TOrder order = tOrderMapper.selectById(id);
+        String result = "";
         if(order != null) {
             String companyType = order.getCompanyType();
             String clientId = order.getClientId();
@@ -271,24 +269,26 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                     Date payDate = order.getPayDate();
                     String pattern = "yyyy-MM-dd HH:mm:ss";
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
-                    String paytime = simpleDateFormat.format(payDate);
+                    String payTime = simpleDateFormat.format(payDate);
                     String clientId6 = clientId.substring(clientId.length() - 6);
                     if (StringUtils.isNotEmpty(companyType) && companyType.equals("1")) {
                         // 如果是七云科技的用户
-                        YunPianSms.sendSms(appid, getScMessage(sn, price, paytime,
+                        result = YunPianSms.sendSms(appid, getScMessage(sn, price, payTime,
                                 equipment.getName(), clientId6, customerPhone), phone);
                     } else {
                         // 如果是申泽智能的用户
-                        YunPianSms.sendSms(appid, getSzMessage(sn, price, paytime,
+                        result = YunPianSms.sendSms(appid, getSzMessage(sn, price, payTime,
                                 equipment.getName(), clientId6, customerPhone), phone);
                     }
                 } catch (Exception e) {
+                    e.printStackTrace();
+                    return "发送短信失败";
                 }
             } else {
                 return "设备运营者手机号为空";
             }
         }
-        return ConfigConsts.SUCCESS;
+        return result;
     }
 
     @Override

+ 6 - 1
src/main/java/com/szwl/util/YunPianSms.java

@@ -104,7 +104,12 @@ public final class YunPianSms {
         params.put("apikey", apikey);
         params.put("text", text);
         params.put("mobile", mobile);
-        return post(URI_SEND_SMS, params);
+        String response = post(URI_SEND_SMS, params);
+        if (response != null) {
+            JSONObject json = new JSONObject(response);
+            return json.getString("msg");
+        }
+        return null;
     }
 
     /**