diff --git a/src/main/java/com/example/demo/domain/entity/GOrder.java b/src/main/java/com/example/demo/domain/entity/GOrder.java new file mode 100644 index 0000000..3677adf --- /dev/null +++ b/src/main/java/com/example/demo/domain/entity/GOrder.java @@ -0,0 +1,36 @@ +package com.example.demo.domain.entity; + +import java.math.BigDecimal; +import lombok.Data; + +@Data +public class GOrder { + + private Integer id; + private Integer jwcode; + private String orderNo; + private String type; // 默认 gold(金豆) gold_coin (金币) + private String merchantId; + private BigDecimal price; + private Integer count; // 金豆数量 + private Integer payStyle; // 1:微信支付;2:支付宝支付;3:IOS内购,4:paypal(USD);5:stripe;6:paymentAsia;7:iPay88(MYR);9:FirstData(SGD) + + private Integer state; // 0待支付 1支付完成 2已关闭 -1已退款 + private Integer platform; // 1PC 2手机端 + private String wxPrepayId; + private String wxCodeUrl; + private String wxTransactionId; + private Integer successTime; // 支付成功时间(Unix秒) + private Integer closedTime; // 订单关闭时间 + private String refundNo; + private Integer refundTime; // 退款时间 + private String iosEnvironment; + private String iosTransactionId; + private String iosReceiptData; // TEXT → String + private String paypalOrderId; + private Integer liveId; // 直播间id + private Boolean isRead; // 已读 + private Integer addTime; // 创建时间 + private Integer updTime; // 更新时间 + private Integer isSynced; // 0未同步 1已同步 +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index 42b903b..880b37d 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -1,6 +1,7 @@ package com.example.demo.mapper.cash; import com.example.demo.domain.entity.CashRecord; +import com.example.demo.domain.entity.GOrder; import com.example.demo.domain.vo.cash.CashCollection; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -45,4 +46,7 @@ public interface CashCollectionMapper { String getMarketNameByJwcode(Integer jwcode); //获取收款活动列表 List getActivityList(); + //查找未同步的订单 + ListgetUnSync(@Param("size")int size); + //同步g_order订单到cash_record表 } diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 45110cd..f98b7ce 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -146,6 +146,9 @@ AND cr.activity like concat('%',#{cashCollection.activity},'%') + + AND cr.payment_currency like concat('%',#{cashCollection.paymentCurrency},'%') + AND cr.goods_name like concat('%',#{cashCollection.goodsName},'%') @@ -189,4 +192,11 @@ + \ No newline at end of file