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

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/biz/DragonPayBiz.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.MultiValueMap;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -90,7 +91,7 @@ public class DragonPayBiz {
             params.add("price", payNotifyDto.getPrice().toString());
             params.add("paymentType", payNotifyDto.getPaymentType());
             params.add("paymentAt", payNotifyDto.getPaymentAt());
-            jsonData = JsonUtils.toJson(params);
+            jsonData = JsonUtils.toJson(covertNVPS2Params(params));
             log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
             log.info("dragon:notify:post data:{}",jsonData);
 
@@ -205,4 +206,12 @@ public class DragonPayBiz {
         }
         return rsMap;
     }
+
+    private static Map<String, Object> covertNVPS2Params(MultiValueMap<String, String> params) {
+        Map<String, Object> rsMap = new HashMap<>();
+        for (Map.Entry<String, List<String>> param : params.entrySet()) {
+            rsMap.put(param.getKey(), param.getValue().get(0));
+        }
+        return rsMap;
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualShopController.java

@@ -58,7 +58,7 @@ public class SweetManualShopController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册iid", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "图片地址", required = false),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "describe", value = "描述", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "描述", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 1吃喝 2玩乐", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isRecommend", value = "是否推荐", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "sort", value = "排序", required = true),
@@ -66,11 +66,11 @@ public class SweetManualShopController {
     public ResponseDto<Boolean> add(@RequestParam String manualId,
                                     @RequestParam String title,
                                     @RequestParam String picUrl,
-                                    @RequestParam String describe,
+                                    @RequestParam String describes,
                                     @RequestParam Integer type,
                                     @RequestParam Integer isRecommend,
                                     @RequestParam Integer sort) {
-        return sweetManualShopService.add(manualId, title, picUrl, describe, type, isRecommend, sort);
+        return sweetManualShopService.add(manualId, title, picUrl, describes, type, isRecommend, sort);
     }
 
     @PostMapping("change")
@@ -79,7 +79,7 @@ public class SweetManualShopController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualShopId", value = "商铺id", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "图片地址", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "describe", value = "描述", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "描述", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 1吃喝 2玩乐", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isRecommend", value = "是否推荐", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "sort", value = "排序", required = true),
@@ -87,11 +87,11 @@ public class SweetManualShopController {
     public ResponseDto<Boolean> change(@RequestParam String manualShopId,
                                        @RequestParam String title,
                                        @RequestParam String picUrl,
-                                       @RequestParam String describe,
+                                       @RequestParam String describes,
                                        @RequestParam Integer type,
                                        @RequestParam Integer isRecommend,
                                        @RequestParam Integer sort) {
-        return sweetManualShopService.change(manualShopId, title, picUrl, describe, type, isRecommend, sort);
+        return sweetManualShopService.change(manualShopId, title, picUrl, describes, type, isRecommend, sort);
     }