离线支付-精简逻辑

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinBraceletOrderEntitiesVo.java

-package com.liquidnet.service.goblin.dto.vo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 手环-子订单VO
- */
-
-@Data
-public class GoblinBraceletOrderEntitiesVo {
-
-    /**
-     * 订单详情ID
-     */
-    private String orderEntitiesId;
-
-    /**
-     * 订单详情关联ID
-     */
-    private String orderId;
-
-    /**
-     * 商品类型：1：手环 2：充值面值
-     */
-    private Integer goodsType;
-
-    /**
-     * 商品ID wristband_id:手环ID amount_id：充值金额ID
-     */
-    private String goodsId;
-
-    /**
-     * 商品名称
-     */
-    private String goodsName;
-
-    /**
-     * 商品金额
-     */
-    private BigDecimal goodsPrice;
-
-    /**
-     * 订单状态:
-     * 0 待付款
-     * 1 已付款
-     * 2 已关闭
-     * 3 正在退款
-     * 4 已退款
-     * 5 待关闭
-     * 6 部分退款
-     */
-    private Integer status;
-
-    /**
-     * 支付状态:
-     * 0 未支付
-     * 1 已支付
-     * 2 支付失败
-     */
-    private Integer payStatus;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinBraceletOrderVo.java

@@ -47,6 +47,26 @@ public class GoblinBraceletOrderVo {
      */
     private String goodsDesc;
 
+    /**
+     * 手环ID
+     */
+    private String wristbandId;
+
+    /**
+     *手环金额
+     */
+    private BigDecimal wristbandPrice;
+
+    /**
+     *充值金额ID
+     */
+    private String amountId;
+
+    /**
+     *充值金额
+     */
+    private BigDecimal amountPrice;
+
     /**
      * 请求流水号
      */
@@ -72,11 +92,6 @@ public class GoblinBraceletOrderVo {
      */
     private String tradeType;
 
-    /**
-     * ATU真实商户号
-     */
-    private String atuSubMerId;
-
     /**
      * 用户账单上的交易订单号
      */
@@ -141,6 +156,7 @@ public class GoblinBraceletOrderVo {
      * 4 已退款
      * 5 待关闭
      * 6 部分退款
+     * 7 退款失败
      */
     private Integer status;
 
@@ -182,11 +198,5 @@ public class GoblinBraceletOrderVo {
      */
     private LocalDateTime updatedAt;
 
-
-    /**
-     * 订单详细列表VO
-     */
-    private List<GoblinBraceletOrderEntitiesVo> orderEntitiesDetailVoList;
-
 }
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/dougong/BaseDougongRequest.java

-package com.liquidnet.service.goblin.param.dougong;
-
-import lombok.Data;
-
-@Data
-public class BaseDougongRequest<T> {
-
-    /**
-     * 系统号
-     * 渠道商/商户的huifu_id
-     * （1）当主体为渠道商时，此字段填写渠道商huifu_id；
-     * （2）当主体为直连商户时，此字段填写商户huifu_id；
-     */
-    private String sysId;
-
-    /**
-     * 产品号
-     * 汇付分配的产品号，示例值：MCS
-     */
-    private String productId;
-
-    /**
-     * 加签结果
-     */
-    private String sign;
-
-    /**
-     * 数据
-     */
-    private T data;
-
-}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/dougong/BaseDougongResponse.java

-package com.liquidnet.service.goblin.param.dougong;
-
-import lombok.Data;
-
-/**
- * 同步返回参数
- * @param <T>
- */
-
-@Data
-public class BaseDougongResponse<T> {
-
-    /**
-     * 签名
-     */
-    private String sign;
-
-    /**
-     * 响应内容体
-     */
-    private T data;
-}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/dougong/DougongRequestParam.java

 package com.liquidnet.service.goblin.param.dougong;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
@@ -92,6 +94,8 @@ public class DougongRequestParam {
 
 
     @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class WxDataGoodsDetail {
 
         // 商品编码

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin-dev.yml

@@ -22,7 +22,7 @@ liquidnet:
         huifu-id: '6666000171841162'
         sys-id: '6666000162031620'
         product-id: 'PAYUN'
-        sub-app-id: 'wxdfe9a5d141f96685'
+        sub-app-id: 'wx4732efeaa2b08086'
         public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArR8pqWsRMqiunn8uEZGF9AeizJK0vuWjlcNnTbw9Sb96dMVuYu3SRj+Dx4E4SgyEL4CYROou1xwY57kAKEqHdH7o1W41O9jYjXZG38BrtBR+D9Qh9OqGxCZ+e4Gi38XHGg6fn67iXefOqp1kWGd4qc8tIZO1lIDXS19R09D/mESNBMulQdVPyZF7gvd11A+7EEOfRlSOjrtqIoUWV0GIqhLPUtGJk8Uq/d9NLitJyvK3tgz8cvJ4RyK6UpGtRDrqiBiQxbvK9EqMd1sw3zkvM03szSWon4LHFNqvDr6RYfFyFUCvX9UPYmeritENnroEuTBlTFLLb68ed4HZEZDPTQIDAQAB"
         private-key: "MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDJAOaA1ikJzDL0vUuTyl3/vlHyuSod6/gFLLrSTD6EJkma5Ld34HHu82/5pEojEvbcU113L9j3fUJlpyjX6CFk6j2KjMIuyFxhgrVFi5WT5m74wYohoWNifkQrgwsO3oxI7cewWFu/w7/yCK9dzI4QxasGUKH9iPweI+26IR0DBbOfC9GVudOy2b2xLrGAevEEHdVTNqrQNdlrTzqAH7r3uk8s2vaBZX+O4gyf7eKdHdC4CVSWfYPLO1sA48MxNwI7OExxfGeV+0wmBMGRSoZ5FhWsqZs+f9jGcmfF+uEfAO71PqHjezXYxq7+oWDfDBPCTc5fo9w5v1HV0aZaYOe1AgMBAAECggEBAI4yR98fInse7XF8NOpBwIv6/QhEfAoc9CHdCfFaJOPiHjIo2a5BpvhPWYj288eqU998TmPSAqDbCUzWm6taOb2lhJHukDT+Y3RMPqcLX275Fsp+SJUQEjoMb3eExh7ny8CQDrOvXoDkH3c/M6ic3Gf7Hslh46dz8D/2VOhXIqoObPlSLzniwiMTDBEwB7IRc3Q+r4V6ZnKt8wjKQZpotBA3TlJlEBBj/h5SbWokwMQbTqFkjl7gVe0ase2WfV+cD4qhPZx6CWphPVyWelg+wpDqXOIQdnE8pgri5a9ZkzgPTOrKyCm+EOa9lZAp81tnb2iFhrlkKPSWUW8zLtZzxMECgYEA+sNyF0U9anyxeKxXtlGKKuMHJSnBpZeU6FSvZjTewFH2Sxh3QwZjg6h5BfvTLH1XfNerx3gdpAPJ+EyAZuEibDr47bp+j4CtT27dVolz5XQ5ugOadwzdNZkq6vhuq1aGATmS/mlNE1/pdMEP9F6hi2HYncER6BFOy0xSwMKCnRECgYEAzTNxhvZ0pb2hPKylxHUydkm3Uznq5Zkquv6II6W5aiKvceETHwdRZLoKc+I0kd0/4fBfJI2Jsjexy51ERiG+8y4wVrcrky6NLw6mnXSvnTSQCftbexheJTg9c5dpfKIj+rxtuBeZ3Sj1MJQ6OSBUYu3iTqstO0Rgp/1ofWQJ8GUCgYEAspxzr0+KJ0cZwbI/54S8vT9n33iWjbQiRDnNlScjYij/HQ4YJI1wZF6jlTeBerbskeesWy+bLS/ltA4Jhz3knuKCXBHyA5TL3UBCN1lAS7c1RuE6LIHlLkAi6ap6aV//ou+3W671T0+JobfB/XVJ61WOTQ8wCfQKA5QhfVsOXYECgYEAvzbm3Ysfm6qfazi+p9lGErASov1fhGA8T1AMcJtnsh1sO8Qu20UodaJfRylNL3dqphIltpwl6eq4RTLhgjDEDTvHU6cQdfB1I5qVbDhlxSpL5uFRl91XLXvA18wKQledC3M3Esr7V/loscIOl1knCaD+t6wPVCEdqK0dB2uHT3kCgYEA3p3rlmCmWzkZ/U8jE4087YEkJWV+r86YC63r4YZEqZtfHk4hNchAYke4jYPqkTtmRVZi2C6KuVr5M3ASHmGWorBY0VA9Abd3daniNocZCeMOt4Z7U6MIbqW7KYSrjx8V8HIsdH7HF97ofRuMH6oaz9bFMM6XwrEAMY+zTdH9A4Y="
         notify-url: 'https://testgoblin.zhengzai.tv/goblin/bracelet/callback'

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinBraceletOrder.java

@@ -59,6 +59,26 @@ public class GoblinBraceletOrder implements Serializable {
      */
     private String goodsDesc;
 
+    /**
+     * 手环ID
+     */
+    private String wristbandId;
+
+    /**
+     *手环金额
+     */
+    private BigDecimal wristbandPrice;
+
+    /**
+     *充值金额ID
+     */
+    private String amountId;
+
+    /**
+     *充值金额
+     */
+    private BigDecimal amountPrice;
+
     /**
      * 请求流水号
      */
@@ -84,10 +104,6 @@ public class GoblinBraceletOrder implements Serializable {
      */
     private String tradeType;
 
-    /**
-     * ATU真实商户号
-     */
-    private String atuSubMerId;
 
     /**
      * 用户账单上的交易订单号
@@ -153,6 +169,7 @@ public class GoblinBraceletOrder implements Serializable {
      * 4 已退款
      * 5 待关闭
      * 6 部分退款
+     * 7 退款失败
      */
     private Integer status;
 

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinBraceletOrderEntities.java

-package com.liquidnet.service.goblin.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 手环订单详情表实体类
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class GoblinBraceletOrderEntities implements Serializable {
-
-    /**
-     * 主键ID
-     */
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * 订单详情ID
-     */
-    private String orderEntitiesId;
-
-    /**
-     * 订单详情关联ID
-     */
-    private String orderId;
-
-    /**
-     * 商品类型：1：手环 2：充值面值
-     */
-    private Integer goodsType;
-
-    /**
-     * 商品ID wristband_id:手环ID amount_id：充值金额ID
-     */
-    private String goodsId;
-
-    /**
-     * 商品名称
-     */
-    private String goodsName;
-
-    /**
-     * 商品金额
-     */
-    private BigDecimal goodsPrice;
-
-    /**
-     * 订单状态:
-     * 0 待付款
-     * 1 已付款
-     * 2 已关闭
-     * 3 正在退款
-     * 4 已退款
-     * 5 待关闭
-     * 6 部分退款
-     */
-    private Integer status;
-
-    /**
-     * 支付状态:
-     * 0 未支付
-     * 1 已支付
-     * 2 支付失败
-     */
-    private Integer payStatus;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -2978,6 +2978,11 @@ public class GoblinRedisUtils {
         redisUtil.set(key, orderVo, RedisKeyExpireConst.GOBLIN_BRACELET_USER_EXPIRE);
     }
 
+    /**
+     * 获取手环订单信息
+     * @param orderId
+     * @return
+     */
     public GoblinBraceletOrderVo getBraceletOrderVo(String orderId){
         String key = GoblinRedisConst.GOBLIN_BRACELET_ORDERID.concat(orderId);
         Object obj = redisUtil.get(key);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -196,9 +196,7 @@ candy_user_coupon.update_apply_refund=UPDATE candy_user_coupon SET state=?,opera
 #----
 #----
 # ---- \u624B\u73AF\u8BA2\u5355 ----
-goblin_bracelet_order_insert = INSERT INTO `goblin_bracelet_order`(`order_id`, `user_id`, `bind_name`, `bind_mobile`, `bind_idcard`, `req_date`, `goods_desc`, `req_seq_id`, `hf_seq_id`, `trade_type`, `atu_sub_mer_id`, `party_order_id`, `price`, `price_total`, `price_refund`, `refund_price_charges`, `refund_number`, `status`, `pay_status`, `created_at`, `updated_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_bracelet_order_insert = INSERT INTO `goblin_bracelet_order`(`order_id`, `user_id`, `bind_name`, `bind_mobile`, `bind_idcard`, `req_date`, `goods_desc`, `wristband_id`, `wristband_price`, `amount_id`, `amount_price`, `req_seq_id`, `hf_seq_id`, `trade_type`, `party_order_id`, `price`, `price_total`, `price_refund`, `refund_price_charges`, `refund_number`, `status`, `pay_status`, `created_at`, `updated_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 gpblin_bracelet_order_update= update goblin_bracelet_order set out_trans_id=?, end_time=?, acct_date=?, price_actual=?, time_pay=?, updated_at=? where order_id=?
-goblin_bracelet_order_entities_insert = INSERT INTO `goblin_bracelet_order_entities`(`order_entities_id`, `order_id`, `goods_type`, `goods_id`, `goods_name`, `goods_price`, `status`, `pay_status`, `created_at`, `updated_at`) VALUES (?,?,?,?,?,?,?,?,?,?)
 goblin_bracelet_order_update_cardno=UPDATE goblin_bracelet_order SET cardno=?,updated_at=? WHERE order_id=?
-goblin_bracelet_order_update_refund=UPDATE goblin_bracelet_order SET status=?,refund_status=?,refund_status_note=?,updated_at=? WHERE order_id=?
-goblie_bracelet_order_entities_update = update goblin_bracelet_order_entities set status=?, pay_status=?, updated_at=? where order_entities_id=?
\ No newline at end of file
+goblin_bracelet_order_update_refund=UPDATE goblin_bracelet_order SET status=?,refund_status=?,refund_status_note=?,updated_at=? WHERE order_id=?
\ No newline at end of file