离线支付-修改表结构

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/goblin_recharge.sql

@@ -33,11 +33,14 @@ CREATE TABLE goblin_bracelet_order
     `bind_mobile`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '绑定用户手机号',
     `bind_idcard`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '绑定用户身份证号码',
     `req_date`             varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '请求日期',
-    `goods_desc`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '请求日期',
+    `goods_desc`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商品描述',
+    `wristband_id`         VARCHAR(64)  CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '手环ID',
+    `wristband_price`      DECIMAL(10, 2) NOT NULL DEFAULT '0.00' COMMENT '手环金额',
+    `amount_id`            VARCHAR(64)  CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '金额ID',
+    `amount_price`         DECIMAL(10, 2) NOT NULL DEFAULT '0.00' COMMENT '充值金额',
     `req_seq_id`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '请求流水号',
     `hf_seq_id`            varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '全局流水号',
     `trade_type`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '交易类型 T_JSAPI: 微信公众号支付 T_MINIAPP: 微信小程序支付 A_JSAPI: 支付宝JS A_NATIVE: 支付宝正扫 U_NATIVE: 银联正扫 U_JSAPI: 银联 JS D_NATIVE: 数字人民币正扫 T_H5：微信直连H5支付 T_APP：微信APP支付 T_NATIVE：微信正扫',
-    `atu_sub_mer_id`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'ATU真实商户号',
     `out_trans_id`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '用户账单上的交易订单号',
     `party_order_id`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '用户账单上的商户订单号',
     `end_time`             varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '支付完成时间 格式yyyyMMddHHmmss',
@@ -60,22 +63,3 @@ CREATE TABLE goblin_bracelet_order
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_0900_ai_ci COMMENT ='手环订单表';
-
--- 手环订单详情表
-CREATE TABLE `goblin_bracelet_order_entities`
-(
-    `mid`               int(10) unsigned                                              NOT NULL AUTO_INCREMENT,
-    `order_entities_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'order_entities_id',
-    `order_id`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单详情关联id',
-    `goods_type`        tinyint(4)                                                    NOT NULL DEFAULT '0' COMMENT '商品类型： 1：手环 2：充值面值',
-    `goods_id`          varchar(64)                                                   NOT NULL DEFAULT '' COMMENT '商品ID wristband_id:手环ID amount_id：充值金额ID',
-    `goods_name`        varchar(255)                                                  NOT NULL DEFAULT '' COMMENT '商品名称',
-    `goods_price`       decimal(10, 2)                                                NOT NULL DEFAULT '0.00' COMMENT '商品金额',
-    `status`            tinyint(4)                                                    NOT NULL DEFAULT '0' COMMENT '订单状态:0待付款，1已付款，2已关闭，3正在退款，4已退款, 5待关闭 6部分退款',
-    `pay_status`        tinyint(4)                                                    NOT NULL DEFAULT '0' COMMENT '支付状态:0未支付 1已支付 2支付失败',
-    `created_at`        timestamp                                                     NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`        timestamp                                                     NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
-    PRIMARY KEY (`mid`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_0900_ai_ci COMMENT ='手环订单详情表';
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinBraceletOrderController.java

@@ -27,7 +27,7 @@ public class GoblinBraceletOrderController {
     private IGoblinBraceletOrderService braceLetOrderService;
 
     @PostMapping("/pre")
-//    @ApiOperation("下单(加密)")
+    @ApiOperation("下单(加密)")
     public ResponseDto<GoblinBraceletPayResultVo> checkOrder(@RequestBody @Valid EncryptedReq<GoblinBraceletOrderPayParam> payParam) {
         return braceLetOrderService.checkOrder(payParam.getData());
     }
@@ -50,7 +50,7 @@ public class GoblinBraceletOrderController {
 
 
     @PostMapping("/callback")
-    @ApiOperation("斗拱支付回调")
+//    @ApiOperation("斗拱支付回调")
     public ResponseDto<Boolean> dougongCallBack(@RequestBody DougongSyncCallbackparam dougongSyncCallbackparam) {
         return braceLetOrderService.dougongCallBack(dougongSyncCallbackparam);
     }