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

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -435,27 +435,27 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
     private void sendQueue(OrderMQDTO orderMQDTO, Integer sign) {
         try {
             orderMQDTO.setSign(sign);
-//            SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
-//                setExchange(ORDER_TOPIC);
-//            }};
-//            sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
+            SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
+                setExchange(ORDER_TOPIC);
+            }};
+            sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
             switch (sign) {
                 case 2:
-//                    sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
-                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_CANCEL, JSONUtil.toJsonStr(orderMQDTO));
+                    sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
+//                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_CANCEL, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 case 4:
-//                    sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
-                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_PAY, JSONUtil.toJsonStr(orderMQDTO));
+                    sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
+//                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_PAY, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 case 6:
-//                    sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
-                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_FINLISH, JSONUtil.toJsonStr(orderMQDTO));
+                    sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
+//                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_FINLISH, JSONUtil.toJsonStr(orderMQDTO));
                     break;
                 default:
                     break;
             }
-//            mqSenderFeign.postSendMessage(BeanUtil.beanToMap(sendMsgDTO, Boolean.FALSE, Boolean.TRUE));
+            mqSenderFeign.postSendMessage(sendMsgDTO);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -205,6 +205,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         }
         log.info("no:" + no + ",时间戳：" + System.currentTimeMillis());
         OrderPageVO orderPageVO = page.getData().get(0);
+        orderPageVO.setQrcodeStr(qrcodePrefix);
         orderPageVO.setItems(orderItemBiz.selectList(new OrderItem(){{
             setOrderId(orderPageVO.getId());
         }}));

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/MQSenderFeign.java

 package com.xxfc.platform.universal.feign;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.universal.dto.SendMsgDTO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -15,6 +14,6 @@ public interface MQSenderFeign {
     public ObjectRestResponse sendMessage(@RequestParam(value = "exchange") String exchange, @RequestParam(value = "routKey")String routKey, @RequestParam(value = "json") String json);
 
     @PostMapping(value = "/message/sendMessage")
-    public ObjectRestResponse postSendMessage(@RequestParam("entity") Map<String, Object> entity);
+    public ObjectRestResponse postSendMessage(@RequestBody SendMsgDTO dto);
 
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/MQSenderController.java

@@ -19,6 +19,7 @@ public class MQSenderController {
     }
 
     @PostMapping(value = "/sendMessage")
+    @ResponseBody
     public ObjectRestResponse sendMessage(@RequestBody SendMsgDTO dto) {
         return mqServiceBiZ.sendMessage(dto.getExchange(), dto.getRoutKey(), dto.getJson());
     }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanyDetail.java

@@ -17,9 +17,11 @@ public class CompanyDetail extends BranchCompany {
 //                if(0 != detailAddrStr.length()) {
 //
 //                }
+                if( !detailAddrStr.toString().contains(sysRegion.getName())) {
                     detailAddrStr.append(sysRegion.getName());
                 }
             }
+        }
 
         detailAddrStr.append(this.getAddrDetail());
         return detailAddrStr.toString();