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

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldsDetailsVo.java

+package com.liquidnet.service.merchant.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.merchant.entity.MerchantFields;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@ApiModel(value = "MerchantFieldsVo", description = "App场地详情")
+@Data
+public class MerchantFieldsDetailsVo implements java.io.Serializable, Cloneable {
+    private static final long serialVersionUID = 2531062739435013044L;
+
+    @ApiModelProperty(position = 11, value = "场地ID")
+    private String fieldId;
+    @ApiModelProperty(position = 16, value = "场地名称[30]")
+    private String name;
+    @ApiModelProperty(position = 17, value = "logo图")
+    private String logo;
+    @ApiModelProperty(position = 18, value = "背景图")
+    private String background;
+    @ApiModelProperty(position = 19, value = "介绍[1000]")
+    private String description;
+    @ApiModelProperty(position = 21, value = "省id")
+    private String provinceId;
+    @ApiModelProperty(position = 22, value = "省名称")
+    private String provinceName;
+    @ApiModelProperty(position = 23, value = "城市id")
+    private String cityId;
+    @ApiModelProperty(position = 24, value = "城市名称")
+    private String cityName;
+    @ApiModelProperty(position = 25, value = "县id")
+    private String districtId;
+    @ApiModelProperty(position = 26, value = "县名称")
+    private String districtName;
+    @ApiModelProperty(position = 27, value = "详细地址[100]")
+    private String address;
+    @ApiModelProperty(position = 28, value = "经度")
+    private String longitude;
+    @ApiModelProperty(position = 29, value = "纬度")
+    private String latitude;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime updatedAt;
+
+
+    private static final MerchantFieldsDetailsVo obj = new MerchantFieldsDetailsVo();
+
+    public static MerchantFieldsDetailsVo getNew() {
+        try {
+            return (MerchantFieldsDetailsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new MerchantFieldsDetailsVo();
+    }
+
+}

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantFieldsService.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.merchant.service;
 
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsDetailsVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 
 import java.util.List;
@@ -19,4 +20,6 @@ public interface IMerchantFieldsService {
     String checkerAdd(String cuid, String fieldId, String uid, String mobile, String name);
 
     void checkerDel(String cuid, String fieldId, String uid);
+
+    MerchantFieldsDetailsVo fieldDetails(String fieldId);
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantFieldsController.java

@@ -8,6 +8,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsDetailsVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.service.IMerchantFieldAppliesService;
 import com.liquidnet.service.merchant.service.IMerchantFieldsService;
@@ -96,7 +97,7 @@ public class MerchantFieldsController {
     @ApiOperation(value = "场地更改是否审核演出")
     @PostMapping("editIsCheck")
     public ResponseDto<Object> editIsCheck(@RequestParam(required = true) @NotBlank(message = "场地ID不能为空") String fieldId,
-                                           @RequestParam(required = true, defaultValue = "0") int isCheck){
+                                           @RequestParam(required = true, defaultValue = "0") int isCheck) {
         String currentUid = CurrentUtil.getCurrentUid();
 
         merchantFieldsService.editIsCheck(currentUid, fieldId, isCheck);
@@ -110,7 +111,7 @@ public class MerchantFieldsController {
     @GetMapping("checkers")
     public ResponseDto<List<MerchantFieldCheckersVo>> checkers(@RequestParam(required = true) @NotBlank(message = "场地ID不能为空") String fieldId) {
         String currentUid = CurrentUtil.getCurrentUid();
-        
+
         return ResponseDto.success(merchantFieldsService.checkers(currentUid, fieldId));
     }
 
@@ -120,7 +121,7 @@ public class MerchantFieldsController {
     public ResponseDto<Object> checkerAdd(@RequestParam(required = true) @NotBlank(message = "场地ID不能为空") String fieldId,
                                           @RequestParam(required = true) @NotBlank(message = "uid不能为空") String uid,
                                           @RequestParam(required = true) @NotBlank(message = "手机号不能为空") String mobile,
-                                          @RequestParam(required = true) @NotBlank(message = "姓名不能为空") String name){
+                                          @RequestParam(required = true) @NotBlank(message = "姓名不能为空") String name) {
         String currentUid = CurrentUtil.getCurrentUid();
 
         return ResponseDto.success(merchantFieldsService.checkerAdd(currentUid, fieldId, uid, mobile, name));
@@ -130,11 +131,21 @@ public class MerchantFieldsController {
     @ApiOperation(value = "场地移除默认验票员")
     @PostMapping("checker/del")
     public ResponseDto<Object> checkerDel(@RequestParam(required = true) @NotBlank(message = "场地ID不能为空") String fieldId,
-                                          @RequestParam(required = true) @NotBlank(message = "uid不能为空") String uid){
+                                          @RequestParam(required = true) @NotBlank(message = "uid不能为空") String uid) {
         String currentUid = CurrentUtil.getCurrentUid();
 
         merchantFieldsService.checkerDel(currentUid, fieldId, uid);
 
         return ResponseDto.success();
     }
+
+
+    @ApiOperationSupport(order = 34)
+    @ApiOperation(value = "App场地详情")
+    @PostMapping("app/details")
+    public ResponseDto<MerchantFieldsDetailsVo> fieldDetails(@RequestParam(required = true) @NotBlank(message = "场地ID不能为空") String fieldId) {
+        MerchantFieldsDetailsVo vo= merchantFieldsService.fieldDetails(fieldId);
+        return ResponseDto.success(vo);
+    }
+
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsServiceImpl.java

 package com.liquidnet.service.merchant.service.impl;
 
 import com.liquidnet.common.exception.LiquidnetServiceException;
-import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.commons.lang.util.StringUtil;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsDetailsVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.service.IMerchantFieldsService;
 import com.liquidnet.service.merchant.service.MerchantMongoService;
@@ -16,6 +15,7 @@ import com.liquidnet.service.merchant.service.MerchantRdmService;
 import com.liquidnet.service.merchant.util.ObjectUtil;
 import com.liquidnet.service.merchant.util.QueueUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -271,6 +271,15 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
     }
 
+    @Override
+    public MerchantFieldsDetailsVo fieldDetails(String fieldId) {
+        MerchantFieldsVo vo = merchantRdmService.getFieldsVoByFieldId(fieldId);
+        MerchantFieldsDetailsVo returnData = MerchantFieldsDetailsVo.getNew();
+        BeanUtils.copyProperties(vo,returnData);
+        return returnData;
+    }
+
+
     private MerchantFieldsVo checkFieldAccount(String uid, String fieldId) {
         // 当前用户是否管理该场地
         MerchantFieldsVo fieldsVo = merchantRdmService.getFieldsVoByFieldId(fieldId);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -308,7 +308,7 @@ public class OrderUtils {
             header.add("Authorization", "Bearer " + CurrentUtil.getToken());
             String resultData = HttpUtil.get(kylinUrl + "/getShunFengPrice/getPrice?adcode=" + adCode + "&productCode=" + productCode, null, header);
             ResponseDto<String> innerReturnVo = JsonUtils.fromJson(resultData, ResponseDto.class);
-            return BigDecimal.valueOf(Integer.parseInt(innerReturnVo.getData().replace("元", "")));
+            return new BigDecimal(innerReturnVo.getData().replace("元", ""));
         } catch (Exception e) {
             log.error("获取快递费失败:{}", e);
             return BigDecimal.valueOf(23);