立即发送下方需显示最近发送时间，时间随上一次立即发送后更新

crmeb-admin/src/main/java/com/zbkj/admin/controller/merchant/NewMerchantApi.java

@@ -46,6 +46,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -378,11 +379,12 @@ public class NewMerchantApi {
 //    @PreAuthorize("hasAuthority('merchant:one:pass:sms:temp:sendSSM')")
     @ApiOperation(value = "发送(id为模板id)")
     @RequestMapping(value = "/sendSSM", method = RequestMethod.POST)
-    public CommonResult<String> sendSSM(@RequestBody @Validated MerchantSmsTiming merchantSmsTiming) {
+    public CommonResult<MerchantSms> sendSSM(@RequestBody @Validated MerchantSmsTiming merchantSmsTiming) {
         String phone = merchantSmsTiming.getPhone();
         String tempId = merchantSmsTiming.getTempId();
-        if (onePassSmsService.sendSSM(phone, Integer.valueOf(tempId))) {
-            return CommonResult.success();
+        MerchantSms merchantSms = onePassSmsService.sendSSM(phone, Integer.valueOf(tempId));
+        if (null!=merchantSms) {
+            return CommonResult.success(merchantSms);
         }
         return CommonResult.failed("请求错误可能是发送次数不够");
     }

crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/NewPlatformApi.java

@@ -168,6 +168,7 @@ public class NewPlatformApi {
             userEnterprise.setAvailableLineOfCredit(BigDecimal.valueOf(0));
             userEnterprise.setIsAuthentication(1);
             userEnterprise.setCreateTime(new Date());
+            userEnterprise.setIsAllOrder(1);
             userEnterpriseService.save(userEnterprise);
 
             //修改用户表字段

crmeb-common/src/main/java/com/zbkj/common/model/user/UserEnterprise.java

@@ -75,4 +75,7 @@ public class UserEnterprise implements Serializable {
 
     @ApiModelProperty(value = "是否已经删除0 正常  1删除")
     private Integer isDelete;
+
+    @ApiModelProperty(value = "是否可以查询全部订单 0 否  1是")
+    private Integer isAllOrder;
 }

crmeb-common/src/main/java/com/zbkj/common/response/UserResponse.java

@@ -90,4 +90,7 @@ public class UserResponse {
 
     @ApiModelProperty(value = "是否是企业用户 1和null是普通用户，2是企业主用户 3是企业子用户")
     private Integer isEnterpriseUser;
+
+    @ApiModelProperty(value = "是否可以查询全部订单 0 否  1是")
+    private Integer isAllOrder;
 }

crmeb-service/src/main/java/com/zbkj/service/service/OnePassSmsService.java

@@ -1,5 +1,6 @@
 package com.zbkj.service.service;
 
+import com.zbkj.common.model.merchant.MerchantSms;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.request.SmsApplyTempRequest;
 import com.zbkj.common.request.SmsModifySignRequest;
@@ -27,7 +28,7 @@ public interface OnePassSmsService {
 
     OnePassSmsTempsListVo temps2(PageParamRequest pageParamRequest);
 
-    Boolean sendSSM(String phone, Integer tempId);
+    MerchantSms sendSSM(String phone, Integer tempId);
 
     Boolean sendSSM2(String phone, Integer tempId,Integer mId);
 

crmeb-service/src/main/java/com/zbkj/service/service/SmsService.java

@@ -1,5 +1,7 @@
 package com.zbkj.service.service;
 
+import com.zbkj.common.model.merchant.MerchantSms;
+
 import java.math.BigDecimal;
 
 /**
@@ -25,7 +27,7 @@ public interface SmsService {
      */
     Boolean sendPaySuccess(String phone, String orderNo, BigDecimal payPrice);
 
-    Boolean sendSSM(String phone, Integer tempId);
+    MerchantSms sendSSM(String phone, Integer tempId);
 
     /**
      * 发送订单发货提醒短信

crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassSmsServiceImpl.java

@@ -163,7 +163,7 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
     }
 
     @Override
-    public Boolean sendSSM(String phone, Integer tempId) {
+    public MerchantSms sendSSM(String phone, Integer tempId) {
         beforeSendMessage();
 
         SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
@@ -173,11 +173,11 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
         HashMap<String, Object> map = CollUtil.newHashMap();
 
         if (one.getTransmissionTimes()<=0){
-            return false;
+            return null;
         }
         List<String> list = Arrays.asList(phone.split(","));
         if (one.getTransmissionTimes()<list.size()){
-            return false;
+            return null;
         }
         int a = 0;
         for (int i = 0;i<list.size();i++){
@@ -189,10 +189,11 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
 
         //发送成功 减次数
             one.setTransmissionTimes( one.getTransmissionTimes()-a );
+            one.setUpdateTime(new Date());
             one.setTransmissionTimesThen( one.getTransmissionTimesThen()+a );
             merchantSmsService.updateById( one );
 
-        return true;
+        return one;
     }
     @Override
     public Boolean sendSSM2(String phone, Integer tempId,Integer merId) {

crmeb-service/src/main/java/com/zbkj/service/service/impl/RefundOrderServiceImpl.java

@@ -757,7 +757,9 @@ public class RefundOrderServiceImpl extends ServiceImpl<RefundOrderDao, RefundOr
             PlatformRefundOrderPageResponse response = new PlatformRefundOrderPageResponse();
             BeanUtils.copyProperties(order, response);
             response.setMerName(merchantMap.get(order.getMerId()).getName());
-            response.setUserNickName(userMap.get(order.getUid()).getNickname());
+            Integer uid = order.getUid();
+            String nickname = userMap.get(uid).getNickname();
+            response.setUserNickName(nickname);
             return response;
         }).collect(Collectors.toList());
         return CommonPage.copyPageInfo(page, responseList);