订单显示

src/main/java/com/izouma/dingdong/dto/OrderInfoDTO.java

@@ -14,7 +14,7 @@ public class OrderInfoDTO extends OrderInfo {
 
     //商家信息
     @ApiModelProperty(value = "商家用户Id",name = "mUserId")
-    private Long mUserId;
+    private Long muserId;
 
     @ApiModelProperty(value = "商户名称", name = "merShowName")
     private String merShowName;
@@ -39,7 +39,7 @@ public class OrderInfoDTO extends OrderInfo {
 
     //骑手信息
     @ApiModelProperty(value = "骑手用户Id",name = "rUserId")
-    private Long rUserId;
+    private Long ruserId;
 
     @ApiModelProperty(value = "骑手工号", name = "jobNumber")
     private String jobNumber;

src/main/java/com/izouma/dingdong/service/OrderInfoService.java

@@ -515,7 +515,7 @@ public class OrderInfoService {
             riderRepo.findById(riderId).ifPresent(rider -> {
                 dto.setJobNumber(rider.getJobNumber());
                 dto.setRiderName(rider.getUser().getNickname());
-                dto.setRUserId(rider.getUserId());
+                dto.setRuserId(rider.getUserId());
             });
             riderLocationRepo.findLastByRiderId(riderId)
                     .ifPresent(lo ->
@@ -531,7 +531,7 @@ public class OrderInfoService {
             dto.setMerAddress(merchant.getAddress());
             dto.setMid(merchant.getId());
             dto.setMerLogo(merchant.getLogo());
-            dto.setMUserId(merchant.getUserId());
+            dto.setMuserId(merchant.getUserId());
         });
 
         return dto;

src/main/java/com/izouma/dingdong/service/merchant/MerchantService.java

@@ -106,12 +106,12 @@ public class MerchantService {
         if (ObjectUtil.isNull(merchantDTO.getFirstOrder())) {
             merchantSettings.setFirstOrder(BigDecimal.ZERO);
         }
-
+        //优先级
+        merchantSettings.setPriority(1);
         merchantSettings.setEnabled(true);
         merchantSettings.setIsOpening(true);
 
-        //优先级
-        merchantSettings.setPriority(1);
+
         //购买口碑联盟
 //        merchantSettings.setBuyAlliance(false);
         merchantSettingsRepo.save(merchantSettings);
@@ -188,6 +188,9 @@ public class MerchantService {
         BeanUtil.copyProperties(dto, merchant);
         BeanUtil.copyProperties(dto, merchantSettings);
         merchantRepo.save(merchant);
+        if (ObjectUtil.isNull(merchantSettings.getPriority())) {
+            merchantSettings.setPriority(1);
+        }
         merchantSettingsRepo.save(merchantSettings);
 
         return dto;

src/main/java/com/izouma/dingdong/service/merchant/MerchantSettingsService.java

@@ -279,8 +279,8 @@ public class MerchantSettingsService {
 
         List<MerchantSettings> collect = all.stream()
                 .filter(a -> a.getStartTime().isBefore(now) && a.getEndTime().isAfter(now) && a.getPriority() >= 1
-                        && a.getIsOpening() && a.getWeek()
-                        .contains(dayOfWeek)
+                        && a.getIsOpening() && a.getWeek().contains(dayOfWeek)
+
                 )
                 .collect(Collectors.toList());
         Set<Merchant> merchantList = new HashSet<>();

src/main/java/com/izouma/dingdong/service/tencent/UserSigService.java

@@ -1,9 +1,19 @@
 package com.izouma.dingdong.service.tencent;
 
 import com.tencentyun.TLSSigAPIv2;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.*;
+
 @Service
 public class UserSigService {
 
@@ -18,4 +28,41 @@ public class UserSigService {
         long expire = 604800L;
         return api.genSig(userId.toString(), expire);
     }
+
+    public void sendSms(Long userId, String userSig) {
+        String url = "https://console.tim.qq.com/v4/openim/sendmsg";
+
+        HttpClient client = HttpClients.createDefault();
+        HttpPost post = new HttpPost(url);
+
+        Map<String, Object> params = new HashMap<>();
+
+        //设置公共参数
+        params.put("sdkappid", sdkAppId);
+        params.put("usersig", userSig);
+        params.put("identifier", userId.toString());
+
+        //回调
+        params.put("random", 9999);
+//        params.put("contenttype", "json");
+
+        List<NameValuePair> urlParameters = new ArrayList<NameValuePair>();
+        for (Iterator iter = params.keySet().iterator(); iter.hasNext(); ) {
+            String name = (String) iter.next();
+            String value = String.valueOf(params.get(name));
+            urlParameters.add(new BasicNameValuePair(name, value));
+        }
+        try {
+            HttpResponse response = client.execute(post);
+            BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
+            StringBuilder result = new StringBuilder();
+            String line = "";
+            while ((line = rd.readLine()) != null) {
+                result.append(line);
+            }
+            rd.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

src/main/java/com/izouma/dingdong/web/OrderInfoController.java

@@ -28,6 +28,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/orderInfo")
@@ -164,8 +165,11 @@ public class OrderInfoController extends BaseController {
 
     @GetMapping("/riderReceived")
     @ApiOperation("骑手端，未接单的订单")
-    public List<OrderInfo> riderReceived() {
-        return orderInfoRepo.findAllByRiderIdIsNullAndMerchantStatus(MerchantStatus.RECEIVED);
+    public List<OrderInfoDTO> riderReceived() {
+        return orderInfoRepo.findAllByRiderIdIsNullAndMerchantStatus(MerchantStatus.RECEIVED)
+                .stream()
+                .map(orderInfoService::toDto)
+                .collect(Collectors.toList());
     }
 
     @GetMapping("/blackAll")

src/test/java/com/izouma/dingdong/contorller/AuthControllerTest.java

@@ -21,7 +21,7 @@ public class AuthControllerTest {
 
     @Test
     public void test1(){
-        //System.out.println(controller.phoneLogin("+8613365135976", "8831", Identity.ADMIN));
-        System.out.println("+8618205083565".substring(3));
+        System.out.println(controller.phoneLogin("+8613365135976", "9487", Identity.USER));
+      //  System.out.println("+8618205083565".substring(3));
     }
 }

src/test/java/com/izouma/dingdong/contorller/OrderInfoControllerTest.java

@@ -103,7 +103,7 @@ public class OrderInfoControllerTest {
 
     @Test
     public void test(){
-        System.out.println(orderInfoController.get(2177L).getMUserId());
+        System.out.println(orderInfoController.get(2177L).getMuserId());
     }
 
 }

src/test/java/com/izouma/dingdong/service/UserSigServiceTest.java

@@ -6,6 +6,7 @@ import com.tencent.xinge.bean.AudienceType;
 import com.tencent.xinge.bean.Message;
 import com.tencent.xinge.bean.MessageType;
 import com.tencent.xinge.push.app.PushAppRequest;
+import com.tencentyun.TLSSigAPIv2;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;
@@ -33,9 +34,9 @@ public class UserSigServiceTest {
 
     @Test
     public void test() {
-        System.out.println(userSigService.generateUserSig(83L));
-//        TLSSigAPIv2 api = new TLSSigAPIv2(1400375593, "7fe225c3b41cf2e7f0c79ebaf0e3b7ec60f6c7188e1561dcfddacb4767654417");
-//        System.out.println(api.genSig("82", 30000));
+//        System.out.println(userSigService.generateUserSig(2244L));
+        TLSSigAPIv2 api = new TLSSigAPIv2(1400375593, "7fe225c3b41cf2e7f0c79ebaf0e3b7ec60f6c7188e1561dcfddacb4767654417");
+        System.out.println(api.genSig("administrator", 30000));
     }
 
     @Test
@@ -43,8 +44,7 @@ public class UserSigServiceTest {
 //        String url1 = "https://console.tim.qq.com/v4/openim/batchsendmsg?random=99999999&contenttype=json";
 //        String url2 = "&sdkappid=1400375593&identifier=administrator&usersig=eJw1jrEOgjAURf*ls4GWV0ogcXFgwmgCRgcWYot5KohtAzXGf7cBvdu9Jye5b1IVZaDcgFqRDKjPap5GpUlGooCSpRt5a4YBJckYpxSSOE5hIShVb7HFWWhkhz0aqxv70H8VL544XZScTdVrd3Z1KKAOT8oIzmyRX8VB7vPnSO*RmTbHdmvWP9Vi52*xOOUJAGP88wUitDTf";
 //        url1 = url1 + url2;
-
-        String url1 = "https://console.tim.qq.com/v4/openim/sendmsg?sdkappid=88888888&identifier=admin&usersig=xxx&random=99999999&contenttype=json";
+        String url1 = "https://console.tim.qq.com/v4/all_member_push/im_push?sdkappid=1400375593&identifier=administrator&usersig=eJw1js8LgjAcxf*XXQvZD9dw0EXxEIQEdvK22Movoo45cxH97w2td3vv8eG9N7qe68QEC84gyXDUfo2exiGJaILR5ifdKWtBI0lSjJngPGNbA9oMHu6wAkr3MMDknfKj*6PwiE3NqDo14wzpXJXVjvS6nDvyavMCbsXS4HAJ7VD6thPL8Qd66OMpwjMRJyk5fL7E9jS*&random=99999999&contenttype=json";
 
         String result = "";
         try {
@@ -54,12 +54,12 @@ public class UserSigServiceTest {
             // 腾讯地图使用GET
             conn.setRequestMethod("GET");
             BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
-//            String line;
-//            // 获取地址解析结果
-//            while ((line = in.readLine()) != null) {
-//                result += line + "\n";
-//            }
-            System.out.println(in);
+            String line;
+            // 获取地址解析结果
+            while ((line = in.readLine()) != null) {
+                result += line + "\n";
+            }
+            System.out.println(line);
             in.close();
         } catch (Exception e) {
             e.getMessage();
@@ -91,26 +91,30 @@ public class UserSigServiceTest {
 
     @Test
     public void test3() {
-        String PayDomain = "https://console.tim.qq.com";
+//        String PayDomain = "https://console.tim.qq.com";
+        String url = "https://console.tim.qq.com/v4/all_member_push/im_push?sdkappid=1400375593&identifier=administrator&usersig=eJw1js8LgjAcxf*XXQvZD9dw0EXxEIQEdvK22Movoo45cxH97w2td3vv8eG9N7qe68QEC84gyXDUfo2exiGJaILR5ifdKWtBI0lSjJngPGNbA9oMHu6wAkr3MMDknfKj*6PwiE3NqDo14wzpXJXVjvS6nDvyavMCbsXS4HAJ7VD6thPL8Qd66OMpwjMRJyk5fL7E9jS*&random=99999999&contenttype=json";
+//        String url1 = "/v4/openim/sendmsg";
 
-        String url = "/v4/all_member_push/im_push";
+        HttpClient client = HttpClients.createDefault();
+        HttpPost post = new HttpPost(url);
+        //设置公共参数
 
-        String url1 = "/v4/openim/sendmsg";
+        Map<String,Object> mgsCon = new HashMap<>();
+        mgsCon.put("Text","hello");
 
-        HttpClient client = HttpClients.createDefault();
-        HttpPost post = new HttpPost(PayDomain + url1);
+        Map<String,Object> mgs = new HashMap<>();
+        mgs.put("MsgType","TIMTextElem");
+        mgs.put("MsgContent",mgsCon);
 
-        Map params = new HashMap();
+        Map<String,Object> params = new HashMap<>();
+        params.put("SyncOtherMachine",2);
+        params.put("To_Account","2244");
+        params.put("MsgRandom","99999");
+        params.put("MsgBody",mgs);
 
-        //设置公共参数
-        params.put("sdkappid", "1400375593");
-        params.put("usersig", "eJw1jl0LgjAYhf-LbgvZ3EY66CpiXaRIRl0PN*3F-GgbYUT-vaF17s55eOC80flYRmYawRokKA5Zz9PTWCRQHGG0dKdbNY6gkSAMY7rhPKULAW16DzXMgtId9OC8VX6wfxWaQHbNdBhWhdN4eOS3smoveVWle3aXNpN5S9npWtBXLSeSbX*ihy6cIjzlCeExTj5fwBE0Ow__");
-        params.put("identifier", "administrator");
 
+        System.out.println(params.toString());
         //回调
-        params.put("random", 9999);
-        params.put("contenttype", "json");
-
         List<NameValuePair> urlParameters = new ArrayList<NameValuePair>();
         for (Iterator iter = params.keySet().iterator(); iter.hasNext(); ) {
             String name = (String) iter.next();