点餐接口

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/kfc/request/CreateOrdereRquest.java

@@ -0,0 +1,166 @@
+package com.zswl.cloud.springBatch.client.model.ypp.kfc.request;
+
+import com.zhongshu.payment.client.type.Channel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * TicketOrderChannelCreateDto，渠道下单
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CreateOrdereRquest {
+    /**
+     * appid
+     */
+    private String appId;
+    /**
+     * 城市id
+     */
+    private Long cityId;
+    private long eatType;
+    /**
+     * 自定义参数
+     */
+    private String entPara;
+    /**
+     * 取餐时间:0 0分钟，1 10分钟 2 20分钟 3 30分钟
+     */
+    private Long mealTime;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 购买的餐品列表
+     */
+    private List<Product> products;
+    /**
+     * 外卖订单必传
+     */
+    private RecAddrDto recAddr;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 店铺id
+     */
+    private String shopId;
+    /**
+     * 是否需要餐具
+     */
+    private Boolean tableWare;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class Product {
+        private Boolean hasRefund;
+        /**
+         * 产品图片
+         */
+        private String imageUrl;
+        private Long index;
+        private String linkId;
+        /**
+         * 产品名称
+         */
+        private String nameCn;
+        /**
+         * 平台订单号
+         */
+        private String orderId;
+        /**
+         * 有票订单号
+         */
+        private String orderSn;
+        private Double orgPrice;
+        /**
+         * 产品id（多规格里面的上级产品id，非多规格留空）
+         */
+        private String pId;
+        /**
+         * 产品id
+         */
+        private String productId;
+        /**
+         * 数量
+         */
+        private long quantity;
+        /**
+         * 退款金额
+         */
+        private Double refundAmount;
+        /**
+         * 退款数量
+         */
+        private Double refundCount;
+        private List<Selected> selected;
+        private Double selPrice;
+        private String spec;
+    }
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class Selected {
+        private List<KfcOrderProductItem> products;
+        /**
+         * 固定值0
+         */
+        private Long round;
+    }
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class KfcOrderProductItem {
+        private String linkId;
+        private String productId;
+        private Long quantity;
+    }
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class RecAddrDto {
+        /**
+         * 地址
+         */
+        private String addr;
+        /**
+         * 联系人
+         */
+        private String contact;
+        private String createTime;
+        /**
+         * 性别
+         */
+        private String gender;
+        private String id;
+        /**
+         * 维度
+         */
+        private double lat;
+        /**
+         * 经度
+         */
+        private double lon;
+        /**
+         * 门牌号
+         */
+        private String number;
+        /**
+         * 联系电话
+         */
+        private String phone;
+        private String userId;
+    }
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/kfc/request/OrderListRequest.java

@@ -0,0 +1,76 @@
+package com.zswl.cloud.springBatch.client.model.ypp.kfc.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+
+/**
+ * MovieOrderQuery
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderListRequest {
+    /**
+     * appid
+     */
+    private String appId;
+    /**
+     * 截至时间
+     */
+    private OffsetDateTime endTime;
+    private Boolean exportExcel;
+    /**
+     * 订单号
+     */
+    private String orderCustomId;
+    /**
+     * 订单状态
+     * 0等待支付
+     * 1订单已付
+     * 2等待出码
+     * 3订单成功
+     * 4订单失败
+     * 5订单取消
+     * 6订单退款
+     * 7未付取消
+     * 8部分退款
+     * 9订单锁定
+     * 10客服处理中
+     * 11等待配送
+     * 12配送中
+     */
+    private Long orderState;
+    private Long orderType;
+    private long pageIndex;
+    private long pageSize;
+    /**
+     * 查询类型：1 创建时间，2 支付时间,(需要同时传时间段)
+     */
+    private Long queryType;
+    /**
+     * 起始时间
+     */
+    private OffsetDateTime startTime;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 用户手机
+     */
+    private String userMobile;
+    /**
+     * 用户姓名
+     */
+    private String userName;
+
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/kfc/response/CityListResponse.java

@@ -0,0 +1,49 @@
+package com.zswl.cloud.springBatch.client.model.ypp.kfc.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CityListResponse {
+    /**
+     * code
+     */
+    private Long code;
+
+    private List<TicketCity> data;
+    /**
+     * message
+     */
+    private String message;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class TicketCity {
+        /**
+         * 城市ID
+         */
+        private String cityId;
+        /**
+         * 首字母
+         */
+        private String letter;
+        /**
+         * 名称
+         */
+        private String name;
+        /**
+         * 拼音
+         */
+        private String pinYin;
+        /**
+         * 省份id
+         */
+        private String provinceId;
+    }
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/kfc/response/CreateOrdereResponse.java

@@ -0,0 +1,41 @@
+package com.zswl.cloud.springBatch.client.model.ypp.kfc.response;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * TicketOrderChannelCreateDto，渠道下单
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CreateOrdereResponse {
+    private Long code;
+    private KfcOrderResult data;
+    private String message;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class KfcOrderResult {
+        /**
+         * 配送费
+         */
+        private Double deliveryPrice;
+        /**
+         * 订单号
+         */
+        private String orderCustomId;
+        /**
+         * 订单id
+         */
+        private String orderId;
+        /**
+         * 支付总价
+         */
+        private Double payAmount;
+        private String payUrl;
+    }
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/kfc/response/OrderDetailResponse.java

@@ -0,0 +1,378 @@
+// ApifoxModel.java
+
+package com.zswl.cloud.springBatch.client.model.ypp.kfc.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * TicketOrderSimpleDtoRequestResult
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderDetailResponse {
+    /**
+     * code
+     */
+    private Long code;
+    private KfcOrderChannelDto data;
+    /**
+     * message
+     */
+    private String message;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class KfcOrderChannelDto {
+        /**
+         * 门店地址
+         */
+        private String address;
+        /**
+         * 所属APPId
+         */
+        private String appId;
+        /**
+         * 用户头像
+         */
+        private String avatarUrl;
+        /**
+         * 竞价次数
+         */
+        private Long biddingCount;
+        /**
+         * 竞价截止时间
+         */
+        private String biddingEndTime;
+        /**
+         * 城市id
+         */
+        private Long cityId;
+        /**
+         * 城市名称
+         */
+        private String cityName;
+        /**
+         * 取餐码，多个用空格分开，如(A3301 A3302)
+         */
+        private String codes;
+        /**
+         * 购买数量
+         */
+        private Long count;
+        /**
+         * 创建时间
+         */
+        private String createTime;
+        private Long eatType;
+        private String eatTypeName;
+        private String entPara;
+        private String entUserId;
+        /**
+         * 本订单佣金
+         */
+        private Double epCommission;
+        /**
+         * 上级代理佣金（无上级代理为0）
+         */
+        private Double epParentCommission;
+        /**
+         * 归属企业用户父id
+         */
+        private String epParentId;
+        /**
+         * 归属企业用户id
+         */
+        private String epUserId;
+        private String epUserName;
+        private String id;
+        /**
+         * 图片地址
+         */
+        private String imageUrl;
+        /**
+         * 订单说明
+         */
+        private String info;
+        /**
+         * 是否渠道收款
+         */
+        private Boolean isChannelPay;
+        /**
+         * Lat
+         */
+        private Double lat;
+        /**
+         * Lon
+         */
+        private Double lon;
+        /**
+         * 出餐时间（单位：秒）
+         */
+        private Long makeMealSeconds;
+        /**
+         * 取餐时间:0 0分钟，1 10分钟 2 20分钟 3 30分钟
+         */
+        private Long mealTime;
+        /**
+         * 订单模式 0自动 1人工
+         */
+        private Long mode;
+        private Double offsetPrice;
+        /**
+         * 自定义订单号
+         */
+        private String orderCustomId;
+        /**
+         * 订单名称
+         */
+        private String orderName;
+        /**
+         * 外部平台支付凭证号
+         */
+        private String orderPayId;
+        /**
+         * 订单签名
+         */
+        private String orderSign;
+        /**
+         * 0:ReadyToPay,等待支付;
+         *
+         * 1:Paid,订单已付;
+         *
+         * 2:WaitCode,等待出码;
+         *
+         * 3:Success,订单成功;
+         *
+         * 4:Failed,订单失败;
+         *
+         * 5:Canceled,订单取消;
+         *
+         * 6:Refunded,订单退款;
+         *
+         * 7:NopayCancel,未付取消;
+         *
+         * 8:PartRefunded,部分退款;
+         *
+         * 9:Locked,订单锁定;
+         *
+         * 10:WaitCustomer,客服处理中;
+         *
+         * 11:WaitDelivery,等待配送;
+         *
+         * 12:Deliverying,配送中;
+         *
+         * 13:WaitKfc,正在出餐;
+         */
+        private Long orderState;
+        /**
+         * 订单状态
+         */
+        private String orderStateName;
+        private Long orderType;
+        /**
+         * 订单类型
+         */
+        private String orderTypeName;
+        /**
+         * 订单原价（市场价）
+         */
+        private Double originPrice;
+        /**
+         * 支付时间
+         */
+        private String paidTime;
+        /**
+         * 支付APPId
+         */
+        private String payAppId;
+        /**
+         * 外部平台支付流水号
+         */
+        private String payTranId;
+        /**
+         * 支付方式
+         */
+        private Long payType;
+        private String payUrl;
+        /**
+         * 平台城市id
+         */
+        private String platformCityId;
+        /**
+         * 平台订单ID
+         */
+        private String platformOrderId;
+        /**
+         * 产品信息（json字符串，内容与创建订单提交products参数一致）
+         */
+        private String productsInfo;
+        private String pushUrl;
+        /**
+         * 取餐二维码的值，多个用空格分开
+         */
+        private String qrCodes;
+        /**
+         * 等待单数
+         */
+        private Long queueSize;
+        /**
+         * 外卖配送地址
+         */
+        private String recAddress;
+        /**
+         * 退款金额
+         */
+        private Double refundAmount;
+        /**
+         * 退款产品
+         */
+        private List<KfcOrderProduct> refundProducts;
+        /**
+         * 退款时间
+         */
+        private String refundTime;
+        /**
+         * 备注
+         */
+        private String remark;
+        /**
+         * 店铺code
+         */
+        private String shopCode;
+        /**
+         * 店铺ID
+         */
+        private String shopId;
+        /**
+         * 店铺
+         */
+        private String shopName;
+        /**
+         * 订单成功时间
+         */
+        private String successTime;
+        /**
+         * 头像地址
+         */
+        private String supplierAvatarUrl;
+        /**
+         * 供应商Id
+         */
+        private String supplierId;
+        /**
+         * 昵称
+         */
+        private String supplierName;
+        /**
+         * 供应商备注
+         */
+        private String supplierRemark;
+        /**
+         * 是否需要餐具
+         */
+        private Boolean tableWare;
+        /**
+         * 分销商总价（非分销模式为0）
+         */
+        private Double totalDistributionPrice;
+        /**
+         * 订单总金额（以建议销售价计算）
+         */
+        private Double totalUserPrice;
+        /**
+         * 更新时间
+         */
+        private String updateTime;
+        /**
+         * 用户ID
+         */
+        private String userId;
+        /**
+         * 用户手机
+         */
+        private String userMobile;
+        /**
+         * 用户姓名
+         */
+        private String userName;
+        /**
+         * 等待时间(分钟)
+         */
+        private Long waitTime;
+    }
+
+// KfcOrderProduct.java
+
+
+    /**
+     * KfcOrderProduct
+     */
+    @Data
+    public class KfcOrderProduct {
+        private Boolean hasRefund;
+        private String imageUrl;
+        private Long index;
+        private String linkId;
+        private String nameCn;
+        /**
+         * 平台订单号
+         */
+        private String orderId;
+        /**
+         * 有票订单号
+         */
+        private String orderSn;
+        private Double orgPrice;
+        /**
+         * 产品id（多规格里面的上级产品id，非多规格留空）
+         */
+        private String pId;
+        /**
+         * 产品id
+         */
+        private String productId;
+        private long quantity;
+        /**
+         * 退款金额
+         */
+        private Double refundAmount;
+        /**
+         * 退款数量
+         */
+        private Double refundCount;
+        private List<KfcOrderProductRound> selected;
+        private Double selPrice;
+        private Double settlePrice;
+        private String spec;
+    }
+
+
+    /**
+     * KfcOrderProductRound
+     */
+    @Data
+    public class KfcOrderProductRound {
+        private List<KfcOrderProductItem> products;
+        private Long round;
+    }
+
+// KfcOrderProductItem.java
+
+
+    /**
+     * KfcOrderProductItem
+     */
+    @Data
+    public class KfcOrderProductItem {
+        private String linkId;
+        private String productId;
+        private Long quantity;
+    }
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/kfc/response/OrderFileResponse.java

@@ -0,0 +1,73 @@
+// ApifoxModel.java
+
+package com.zswl.cloud.springBatch.client.model.ypp.kfc.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * TicketOrderSimpleDtoRequestResult
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderFileResponse {
+    /**
+     * code
+     */
+    private Long code;
+
+    private List<FileStoreDto> data;
+    /**
+     * message
+     */
+    private String message;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class FileStoreDto {
+        /**
+         * 文件描述
+         */
+        private String fileDescription;
+        /**
+         * 文件扩展名
+         */
+        private String fileExtension;
+        /**
+         * 文件Hash
+         */
+        private String fileHash;
+        /**
+         * 文件类型
+         */
+        private String fileMIME;
+        /**
+         * 文件名称
+         */
+        private String fileName;
+        /**
+         * 文件操作
+         */
+        private Long fileOperation;
+        /**
+         * 文件路径
+         */
+        private String filePath;
+        private String id;
+        /**
+         * 多图片索引
+         */
+        private Long index;
+        /**
+         * 最后操作时间
+         */
+        private String lastOperatedTime;
+        private String orderId;
+    }
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/kfc/response/ShopResponse.java

@@ -0,0 +1,72 @@
+package com.zswl.cloud.springBatch.client.model.ypp.kfc.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ShopResponse {
+    private Long code;
+    private Datum data;
+    /**
+     * message
+     */
+    private String message;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Datum {
+        /**
+         * 地址
+         */
+        private String address;
+        /**
+         * 城市代码
+         */
+        private String cityCode;
+        /**
+         * 城市id
+         */
+        private Long cityId;
+        /**
+         * 城市名称
+         */
+        private String cityName;
+        /**
+         * 关门时间
+         */
+        private String closeTime;
+        private String createTime;
+        /**
+         * 距离
+         */
+        private Double distance;
+        private Boolean enable;
+        private String id;
+        /**
+         * 纬度
+         */
+        private Double lat;
+        /**
+         * 经度
+         */
+        private Double lon;
+        /**
+         * 开始营业时间
+         */
+        private String openTime;
+        /**
+         * 店铺代码
+         */
+        private String shopCode;
+        /**
+         * 店铺名称
+         */
+        private String shopName;
+    }
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/kfc/response/ShopsResponse.java

@@ -0,0 +1,72 @@
+package com.zswl.cloud.springBatch.client.model.ypp.kfc.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ShopsResponse {
+    private Long code;
+    private List<Datum> data;
+    /**
+     * message
+     */
+    private String message;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Datum {
+        /**
+         * 地址
+         */
+        private String address;
+        /**
+         * 城市代码
+         */
+        private String cityCode;
+        /**
+         * 城市id
+         */
+        private Long cityId;
+        /**
+         * 城市名称
+         */
+        private String cityName;
+        /**
+         * 关门时间
+         */
+        private String closeTime;
+        private String createTime;
+        /**
+         * 距离
+         */
+        private Double distance;
+        private Boolean enable;
+        private String id;
+        /**
+         * 纬度
+         */
+        private Double lat;
+        /**
+         * 经度
+         */
+        private Double lon;
+        /**
+         * 开始营业时间
+         */
+        private String openTime;
+        /**
+         * 店铺代码
+         */
+        private String shopCode;
+        /**
+         * 店铺名称
+         */
+        private String shopName;
+    }
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/request/CreateOrder2Request.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/movie/request/CreateOrder2Request.java

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.ypp.request;
+package com.zswl.cloud.springBatch.client.model.ypp.movie.request;
 
 import com.zhongshu.payment.client.type.Channel;
 import lombok.AllArgsConstructor;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/request/CreateOrdereRquest.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/movie/request/CreateOrdereRquest.java

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.ypp.request;
+package com.zswl.cloud.springBatch.client.model.ypp.movie.request;
 
 import com.zhongshu.payment.client.type.Channel;
 import io.swagger.annotations.ApiModelProperty;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/request/OrderListRequest.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/movie/request/OrderListRequest.java

@@ -1,10 +1,9 @@
-package com.zswl.cloud.springBatch.client.model.request;
+package com.zswl.cloud.springBatch.client.model.ypp.movie.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
 import java.util.List;
 
 /**
@@ -33,7 +32,7 @@ public class OrderListRequest {
     /**
      * 截至时间
      */
-    private OffsetDateTime endTime;
+    private String endTime;
     /**
      * 渠道订单id
      */
@@ -57,7 +56,7 @@ public class OrderListRequest {
     /**
      * 起始时间
      */
-    private OffsetDateTime startTime;
+    private String startTime;
 
 
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/response/CreateOrder2Response.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/movie/response/CreateOrder2Response.java

@@ -1,6 +1,6 @@
 // ApifoxModel.java
 
-package com.zswl.cloud.springBatch.client.model.ypp.response;
+package com.zswl.cloud.springBatch.client.model.ypp.movie.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/response/CreateOrdereResponse.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/movie/response/CreateOrdereResponse.java

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.ypp.response;
+package com.zswl.cloud.springBatch.client.model.ypp.movie.response;
 
 
 import lombok.AllArgsConstructor;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/response/OrderDetailResponse.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/movie/response/OrderDetailResponse.java

@@ -1,6 +1,6 @@
 // ApifoxModel.java
 
-package com.zswl.cloud.springBatch.client.model.ypp.response;
+package com.zswl.cloud.springBatch.client.model.ypp.movie.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/ypp/KfcApi.java

@@ -0,0 +1,269 @@
+package com.zswl.cloud.springBtach.server.core.api.ypp;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONConfig;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.zswl.cloud.springBatch.client.model.ypp.kfc.request.OrderListRequest;
+import com.zswl.cloud.springBatch.client.model.ypp.kfc.request.CreateOrdereRquest;
+import com.zswl.cloud.springBatch.client.model.ypp.kfc.response.*;
+import com.zswl.cloud.springBtach.server.core.dao.ApiLogDao;
+import com.zswl.cloud.springBtach.server.core.domain.ApiLog;
+import com.zswl.cloud.springBtach.server.core.helper.RedisHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.util.HashMap;
+
+//接口地址 https://apifox.com/apidoc/shared-48c64918-c4ce-49f4-b846-d23855299d7a/doc-2590155
+@Component
+public class KfcApi {
+
+    @Autowired
+    RedisHelper redisHelper;
+
+
+    @Autowired
+    private ApiLogDao apiLogDao;
+
+    @Value("${ypp.entId}")
+    private String entId;
+
+    @Value("${ypp.appSecret}")
+    private String appSecret;
+
+    @Value("${ypp.appId}")
+    private String appId;
+    @Value("${ypp.test}")
+    private Boolean test;
+
+
+    private final String tokenName = "ypp-token";
+    private final String tokenValue = "Bearer ";
+
+
+    /**
+     * 订单上传文件列表
+     *
+     * @param orderId
+     * @return
+     */
+    public OrderFileResponse order_files(String orderId) {
+        String entries = httpGet("https://channel.youpiaopiao.cn/api/kfc/order_files?id=" + orderId);
+
+        OrderFileResponse bean = JSONUtil.toBean(entries, OrderFileResponse.class);
+        return bean;
+
+    }
+
+    /**
+     * 订单详情
+     *
+     * @param orderId
+     * @return
+     */
+
+    public OrderDetailResponse order_detail(String orderId) {
+        String entries = httpGet("https://channel.youpiaopiao.cn/api/kfc/order_detail?id=" + orderId);
+
+        OrderDetailResponse bean = JSONUtil.toBean(entries, OrderDetailResponse.class);
+        return bean;
+
+    }
+
+    /**
+     * 城市列表
+     *
+     * @return
+     */
+    public CityListResponse cityList() {
+        String entries = httpGet("https://channel.youpiaopiao.cn/api/city/list");
+
+        CityListResponse bean = JSONUtil.toBean(entries, CityListResponse.class);
+        return bean;
+
+    }
+
+    /**
+     * 支付订单(支付成功后调用)
+     *
+     * @param orderId
+     * @return
+     */
+    public JSONObject pay_order(String orderId) {
+        String entries = httpGet("https://channel.youpiaopiao.cn/api/kfc/pay_order?id=" + orderId + "&test=" + test);
+        JSONConfig jsonConfig = JSONConfig.create();
+        jsonConfig.setIgnoreError(true);
+        return JSONUtil.parseObj(entries, jsonConfig);
+
+    }
+
+    /**
+     * 下单(自己做产品展示，才需要下单接口)
+     *
+     * @param createOrdereRquest
+     * @return
+     */
+    public CreateOrdereResponse create_order(CreateOrdereRquest createOrdereRquest) {
+        createOrdereRquest.setAppId(appId);
+        JSONObject entries = httpPost("https://channel.youpiaopiao.cn/api/kfc/create_order", createOrdereRquest);
+        CreateOrdereResponse bean = JSONUtil.toBean(entries, CreateOrdereResponse.class);
+        return bean;
+
+    }
+
+
+    /**
+     * 订单列表
+     *
+     * @param orderListRequest
+     * @return
+     */
+    public JSONObject order_list(OrderListRequest orderListRequest) {
+        JSONObject entries = httpPost("https://channel.youpiaopiao.cn/api/kfc/order_list", orderListRequest);
+        return entries;
+
+    }
+
+    /**
+     * 平台店铺列表
+     *
+     * @param ot
+     * @param cityId
+     * @param lat
+     * @param lon
+     * @return
+     */
+    public ShopsResponse shops(String ot, String cityId, String lat, String lon) {
+        String baseUrl = "https://channel.youpiaopiao.cn/api/kfc/shops";
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(baseUrl);
+        builder.queryParam("ot", ot);
+        builder.queryParam("cityId", cityId);
+        builder.queryParam("lat", lat);
+        builder.queryParam("lon", lon);
+        String entries = httpGet(builder.build().toUriString());
+        return JSONUtil.toBean(entries, ShopsResponse.class);
+
+    }
+
+    /**
+     * 店铺详情，如果传了经纬度，返回距离
+     * @param id
+     * @param lat
+     * @param lon
+     * @return
+     */
+    public ShopResponse shop(String id, String lat, String lon) {
+        String baseUrl = "https://channel.youpiaopiao.cn/api/kfc/shop";
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(baseUrl);
+        builder.queryParam("id", id);
+        builder.queryParam("lat", lat);
+        builder.queryParam("lon", lon);
+        String entries = httpGet(builder.build().toUriString());
+        return JSONUtil.toBean(entries, ShopResponse.class);
+
+    }
+
+    /**
+     * 菜单
+     * @param shopId
+     * @return
+     */
+    public JSONObject menus(String shopId) {
+        String baseUrl = "https://channel.youpiaopiao.cn/api/kfc/menus";
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(baseUrl);
+        builder.queryParam("shopId", shopId);
+        String entries = httpGet(builder.build().toUriString());
+        JSONConfig jsonConfig = new JSONConfig();
+        jsonConfig.setIgnoreError(true);
+        return JSONUtil.parseObj(entries, jsonConfig);
+
+    }
+
+    /**
+     * 商品详情(不同平台返回的商品详情不一致)
+     * @param shopId
+     * @param productId
+     * @return
+     */
+    public JSONObject goods_detail(String shopId, String productId) {
+        String baseUrl = "https://channel.youpiaopiao.cn/api/kfc/goods_detail";
+
+        UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(baseUrl);
+        builder.queryParam("shopId", shopId);
+        builder.queryParam("productId", productId);
+        String entries = httpGet(builder.build().toUriString());
+        JSONConfig jsonConfig = new JSONConfig();
+        jsonConfig.setIgnoreError(true);
+        return JSONUtil.parseObj(entries, jsonConfig);
+
+    }
+
+
+
+    private String httpGet(String url) {
+        ApiLog apiLog = new ApiLog();
+        apiLog.setRequest(url);
+        apiLog.setSystem("kfc");
+        String token = getoken();
+        HttpRequest get = HttpUtil.createGet(url);
+        HttpResponse execute = get.header("Authorization", token).execute();
+        String body = execute.body();
+        apiLog.setResponse(body);
+        apiLogDao.save(apiLog);
+        JSONObject entries = JSONUtil.parseObj(body);
+        Integer code = (Integer) entries.get("code");
+        Assert.isTrue(execute.isOk(), "飘飘响应错误");
+        Assert.isTrue(code.equals(0), String.valueOf(entries.get("message")));
+        return body;
+
+    }
+
+    private JSONObject httpPost(String url, Object body) {
+
+        HttpRequest post = HttpUtil.createPost(url);
+        if (!url.contains("api/oauth/token")) {
+            String token = getoken();
+            post.header("Authorization", token);
+        }
+
+        ApiLog apiLog = new ApiLog();
+        apiLog.setRequest(url);
+        apiLog.setSystem("kfc");
+        apiLog.setService(url);
+        HttpResponse execute = post.body(JSONUtil.toJsonStr(body)).execute();
+        String response = execute.body();
+        apiLog.setRequest(JSONUtil.toJsonStr(body));
+        apiLog.setResponse(response);
+        apiLogDao.save(apiLog);
+        JSONObject entries = JSONUtil.parseObj(response);
+        Integer code = (Integer) entries.get("code");
+        Assert.isTrue(code.equals(0), String.valueOf(entries.get("message")));
+        return entries;
+    }
+
+    private String getoken() {
+        Object value = redisHelper.getValue(tokenName);
+        if (!ObjectUtil.isEmpty(value)) {
+            return String.valueOf(value);
+        }
+        HashMap<String, String> para = new HashMap<>();
+        para.put("entId", entId);
+        para.put("appSecret", appSecret);
+        JSONObject http = httpPost("https://channel.youpiaopiao.cn/api/oauth/token", para);
+        String access_token = (String) http.getByPath("data.access_token");
+        String token = tokenValue + access_token;
+        redisHelper.cacheValue(tokenName, token, 82800);
+        return token;
+    }
+
+}

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/ypp/YppApi.java

@@ -7,12 +7,12 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.zswl.cloud.springBatch.client.model.ypp.request.CreateOrder2Request;
-import com.zswl.cloud.springBatch.client.model.ypp.request.CreateOrdereRquest;
-import com.zswl.cloud.springBatch.client.model.request.OrderListRequest;
-import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrdereResponse;
-import com.zswl.cloud.springBatch.client.model.ypp.response.OrderDetailResponse;
-import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrder2Response;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.request.CreateOrder2Request;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.request.CreateOrdereRquest;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.request.OrderListRequest;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.response.CreateOrdereResponse;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.response.OrderDetailResponse;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.response.CreateOrder2Response;
 import com.zswl.cloud.springBtach.server.core.dao.ApiLogDao;
 import com.zswl.cloud.springBtach.server.core.domain.ApiLog;
 import com.zswl.cloud.springBtach.server.core.helper.RedisHelper;
@@ -316,7 +316,7 @@ public class YppApi {
     private String httpGet(String url) {
         ApiLog apiLog = new ApiLog();
         apiLog.setRequest(url);
-        apiLog.setSystem("ypp");
+        apiLog.setSystem("movie");
         String token = getoken();
         HttpRequest get = HttpUtil.createGet(url);
         HttpResponse execute = get.header("Authorization", token).execute();
@@ -341,7 +341,7 @@ public class YppApi {
 
         ApiLog apiLog = new ApiLog();
         apiLog.setRequest(url);
-        apiLog.setSystem("ypp");
+        apiLog.setSystem("movie");
         apiLog.setService(url);
         HttpResponse execute = post.body(JSONUtil.toJsonStr(body)).execute();
         String response = execute.body();

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/YppController.java

@@ -4,8 +4,7 @@ import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
-import com.zswl.cloud.springBatch.client.model.ypp.request.CreateOrder2Request;
-import com.zswl.cloud.springBatch.client.model.ypp.request.CreateOrdereRquest;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.request.CreateOrder2Request;
 import com.zswl.cloud.springBtach.server.core.service.YppService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/ypp/YppDeliveryJob.java

@@ -11,7 +11,7 @@ import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.service.v2.PaymentService2;
 import com.zhongshu.payment.client.type.OrderType;
 import com.zswl.cloud.shop.client.service.ShopService;
-import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrder2Response;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.response.CreateOrder2Response;
 import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
 import com.zswl.cloud.springBtach.server.core.helper.RedisHelper;
 import com.zswl.cloud.springBtach.server.core.job.standard.StandarDeliveryJob;

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/ypp/YppPayJob.java

@@ -7,9 +7,8 @@ import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
 import com.zhongshu.payment.client.model.payment.zswl.CreatePayment2Model;
 import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.service.v2.PaymentService2;
-import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrder2Response;
-import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrdereResponse;
-import com.zswl.cloud.springBatch.client.model.ypp.response.OrderDetailResponse;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.response.CreateOrder2Response;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.response.OrderDetailResponse;
 import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
 import com.zswl.cloud.springBtach.server.core.job.standard.StandarPayJob;
 import lombok.Data;

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/YppService.java

@@ -17,9 +17,9 @@ import com.zhongshu.payment.client.type.TransferType;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.AccountDetailVo;
 import com.zswl.cloud.shop.client.vo.life.SharePlatformVo;
-import com.zswl.cloud.springBatch.client.model.ypp.request.CreateOrder2Request;
-import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrder2Response;
-import com.zswl.cloud.springBatch.client.model.ypp.response.OrderDetailResponse;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.request.CreateOrder2Request;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.response.CreateOrder2Response;
+import com.zswl.cloud.springBatch.client.model.ypp.movie.response.OrderDetailResponse;
 import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
 import com.zswl.cloud.springBtach.server.core.api.ypp.request.SyncOrderRequest;
 import com.zswl.cloud.springBtach.server.core.dao.ApiLogDao;

SpringBatchServiceServer/src/test/java/com/zswl/cloud/springBtach/server/boot/ServerApplicationTests.java

@@ -20,7 +20,6 @@ import com.zhongshu.payment.client.model.order.v2.UserSeachOrder2Model;
 import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.service.v2.PaymentService2;
 import com.zhongshu.payment.client.type.Channel;
-import com.zswl.cloud.shop.client.dto.life.TripartiteShopDto;
 import com.zswl.cloud.shop.client.service.GoodsService;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.springBatch.client.model.dfy.Hotel.request.SubmitOrderRequest;
@@ -30,17 +29,21 @@ import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.PrivilegeTicke
 import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.ScenicDetailRequest;
 import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.ScenicListRequest;
 import com.zswl.cloud.springBatch.client.model.dfy.Ticket.response.ScenicListResponse;
+import com.zswl.cloud.springBatch.client.model.qiuxiang.OrderRequest;
+import com.zswl.cloud.springBatch.client.model.xiaoju.ActivityModel;
+import com.zswl.cloud.springBatch.client.model.ypp.kfc.response.CityListResponse;
 import com.zswl.cloud.springBatch.client.service.DfyHotelService;
 import com.zswl.cloud.springBtach.server.core.api.dfy.DomesticHotelApi;
 import com.zswl.cloud.springBtach.server.core.api.dfy.TicketApi;
+import com.zswl.cloud.springBtach.server.core.api.qiuxiang.QiuXiangApi;
+import com.zswl.cloud.springBtach.server.core.api.ypp.KfcApi;
 import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
 import com.zswl.cloud.springBtach.server.core.controller.TestSpringBatch;
-import com.zswl.cloud.springBtach.server.core.dao.XiaoJuStoreDao;
-import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
+import com.zswl.cloud.springBtach.server.core.dao.XiaoJuActivityReceiverDao;
 import com.zswl.cloud.springBtach.server.core.service.PaymentService;
-import com.zswl.cloud.springBtach.server.core.service.impl.XiaoJuServiceImpl;
 import com.zswl.cloud.springBtach.server.core.service.impl.DfyTicketServiceImpl;
 import com.zswl.cloud.springBtach.server.core.service.impl.OrderServiceImpl;
+import com.zswl.cloud.springBtach.server.core.service.impl.XiaoJuServiceImpl;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,18 +74,23 @@ public class ServerApplicationTests {
     PaymentService2 paymentService2;
 
 
-
     @Autowired
     PaymentService paymentService;
-    @Autowired
-    private XiaoJuStoreDao xiaoJuStoreDao;
 
+    @Autowired
+    QiuXiangApi qiuXiangApi;
 
     @Autowired
     TicketApi diFengYunApi;
 
     @Autowired
     DfyHotelService dfyHotelService;
+    @Autowired
+    private XiaoJuServiceImpl xiaoJuServiceImpl;
+    @Autowired
+    private XiaoJuActivityReceiverDao xiaoJuActivityReceiverDao;
+    @Autowired
+    private KfcApi kfcApi;
 
     @Test
     public void dfy() {
@@ -94,12 +102,11 @@ public class ServerApplicationTests {
         scenic.setPageSize(10);
 
 
-
         ScenicListResponse scenicListResponse = diFengYunApi.scenicList(scenic);
         System.out.println(JSONUtil.toJsonStr(scenicListResponse));
 
 
-        ScenicDetailRequest  scenicDetailRequest= new ScenicDetailRequest();
+        ScenicDetailRequest scenicDetailRequest = new ScenicDetailRequest();
         scenicDetailRequest.setScenicId("poi1745");
 
 //        ScenicDetailResponse scenicDetailResponse = diFengYunApi.scenicDetail(scenicDetailRequest);
@@ -117,8 +124,9 @@ public class ServerApplicationTests {
 
     @Autowired
     DomesticHotelApi domesticHotelApi;
+
     @Test
-    public void hotel(){
+    public void hotel() {
 //        CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
 //        cancelOrderRequest.setOrderId("1248207159");
 //
@@ -150,37 +158,10 @@ public class ServerApplicationTests {
 
     @Test
     public void test3() {
-
-        for (XiaoJuStore xiaoJuStore : xiaoJuStoreDao.findAll()) {
-
-            TripartiteShopDto tripartiteShopDto = new TripartiteShopDto();
-            tripartiteShopDto.setKey("加油");
-            tripartiteShopDto.setTripartiteId(xiaoJuStore.getStoreId());
-            tripartiteShopDto.setShopName(xiaoJuStore.getStoreName());
-            tripartiteShopDto.setShopMenuId("4");
-            tripartiteShopDto.setProvince(xiaoJuStore.getProvinceName());
-            tripartiteShopDto.setCity(xiaoJuStore.getCityName());
-            tripartiteShopDto.setAddress(xiaoJuStore.getAddress());
-            tripartiteShopDto.setMapLon(String.valueOf(xiaoJuStore.getLon()));
-            tripartiteShopDto.setMapLat(String.valueOf(xiaoJuStore.getLat()));
-            tripartiteShopDto.setLogoPath(xiaoJuStore.getLogo());
-            if (xiaoJuStore.getPicList().size() > 0) {
-                tripartiteShopDto.setDetailImg(xiaoJuStore.getPicList().get(0));
-            }
-            tripartiteShopDto.setTripartiteJson(JSONUtil.toJsonStr(xiaoJuStore));
-
-            com.zswl.cloud.shop.client.ret.ResultContent resultContent = shopService.tripartiteShop(tripartiteShopDto);
-            log.info("创建店铺响应{}", JSONUtil.toJsonStr(resultContent));
-        }
-
-
-
+        CityListResponse cityListResponse = kfcApi.cityList();
 
     }
 
-    @Autowired
-    XiaoJuServiceImpl xiaoJuService;
-
 
     @Autowired
     GoodsService goodsService;
@@ -288,8 +269,9 @@ public class ServerApplicationTests {
 
     @Autowired
     DfyTicketServiceImpl dfyTicketService;
+
     @Test
-    public void sync(){
+    public void sync() {
         UserSeachOrder2Model userSeachOrder2Model = new UserSeachOrder2Model();
         userSeachOrder2Model.setChannel(Channel.ZhongShu);
         userSeachOrder2Model.setUserId("660a534e32e63427d1a09c2a");