gongfuzhu 1 éve
szülő
commit
1d277928e9

+ 3 - 1
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Hotel/request/SubmitOrderRequest.java

@@ -6,6 +6,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -21,7 +23,7 @@ public class SubmitOrderRequest extends DfyBaseData {
     private int payType;
 
     @ApiModelProperty(value = "付款金额(单位元,不支持小数)")
-    private String pay;
+    private BigDecimal pay;
 
     @ApiModelProperty(value = "平台标识", allowableValues = "10001, 20000, 30001, 30002, 30003")
     private String platform;

+ 2 - 1
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/DfyHotelServiceImpl.java

@@ -113,8 +113,9 @@ public class DfyHotelServiceImpl implements DfyHotelService {
         createOrder2Model.setOrderNo(orderNo);
         createOrder2Model.setUserId(authHelper.getCurrentUser().getUserId());
         createOrder2Model.setShopId(shopId);
-        JSONObject shopInfo = JSONUtil.parseObj(hotelDetailResponse);
+        JSONObject shopInfo = JSONUtil.parseObj(hotelDetailResponse.getData());
         shopInfo.set("hotelIdPic", addOrderRequest.getHotelIdPic());
+        shopInfo.set("shopName",hotelDetailResponse.getData().getChineseName());
         createOrder2Model.setShopInfo(shopInfo);
         createOrder2Model.setTotalAmount(totalPrice);
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);