离线支付-迈之屏蔽前端不需要的接口，完善对款

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinRechargeWristbandService.java

@@ -31,7 +31,7 @@ public interface IGoblinRechargeWristbandService extends IService<GoblinRecharge
 
     DeviceRecordResponse getDeviceRecord(String cardno, Integer page);
 
-    ChangeDeviceStatusResponse changeDeviceStatus(String cardno, int type);
+    ChangeDeviceStatusResponse changeDeviceStatus(String orderId, int type);
 
     Boolean refundRes();
 }

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

@@ -46,7 +46,7 @@ public class GoblinRechargeAmountController {
         }
     }
 
-    @PostMapping("order/create")
+    /*@PostMapping("order/create")
     @ApiOperation("创建订单")
     public ResponseDto<String> createOrder(@RequestBody OrderParam param) {
         OrderResponse res = iGoblinRechargeWristbandService.createOrder(param);
@@ -55,9 +55,9 @@ public class GoblinRechargeAmountController {
         } else {
             return ResponseDto.failure(res.getMsg());
         }
-    }
+    }*/
 
-    @PostMapping("order/info")
+    /*@PostMapping("order/info")
     @ApiOperation("订单查询")
     public ResponseDto<List<OrderInfoResponse.OrderList>> getOrder(@RequestBody OrderInfoParam param) {
         OrderInfoResponse res = iGoblinRechargeWristbandService.getOrder(param);
@@ -66,7 +66,7 @@ public class GoblinRechargeAmountController {
         } else {
             return ResponseDto.failure();
         }
-    }
+    }*/
 
     @GetMapping("order/qrcode")
     @ApiOperation("获取二维码字符串")
@@ -82,10 +82,10 @@ public class GoblinRechargeAmountController {
         }
     }
 
-    @GetMapping("device/mumber")
+    /*@GetMapping("device/mumber")
     @ApiOperation("获取设备编号列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "param", required = true, name = "operationNo", value = "分订单号"),
+            @ApiImplicitParam(type = "param", required = true, name = "operationNo", value = "活动号"),
     })
     public ResponseDto<Boolean> getDeviceNumber(
             @NotNull(message = "参数无效") @RequestParam("operationNo") Integer operationNo
@@ -96,7 +96,7 @@ public class GoblinRechargeAmountController {
         } else {
             return ResponseDto.failure();
         }
-    }
+    }*/
 
     @GetMapping("device/balance")
     @ApiOperation("获取余额")
@@ -135,12 +135,12 @@ public class GoblinRechargeAmountController {
     @GetMapping("order/refund/apply")
     @ApiOperation("退款申请")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "param", required = true, name = "cardno", value = "设备编号"),
+            @ApiImplicitParam(type = "param", required = true, name = "orderId", value = "订单编号"),
     })
     public ResponseDto<ChangeDeviceStatusResponse> refundApply(
-            @NotBlank(message = "参数无效:cardno") @RequestParam("cardno") String cardno
+            @NotBlank(message = "参数无效:orderId") @RequestParam("orderId") String orderId
     ) {
-        ChangeDeviceStatusResponse res = iGoblinRechargeWristbandService.changeDeviceStatus(cardno, 1);
+        ChangeDeviceStatusResponse res = iGoblinRechargeWristbandService.changeDeviceStatus(orderId, 1);
         if (null != res && res.getErrcode() == 200) {
             return ResponseDto.success(res);
         } else {
@@ -148,7 +148,7 @@ public class GoblinRechargeAmountController {
         }
     }
 
-    @GetMapping("order/refund/result")
+    /*@GetMapping("order/refund/result")
     @ApiOperation("退款结果查询")
     public ResponseDto<Boolean> refundRes() {
         Boolean res = iGoblinRechargeWristbandService.refundRes();
@@ -157,6 +157,6 @@ public class GoblinRechargeAmountController {
         } else {
             return ResponseDto.failure();
         }
-    }
+    }*/
 
 }

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

@@ -188,11 +188,28 @@ public class GoblinRechargeWristbandServiceImpl extends ServiceImpl<GoblinRechar
     }
 
     @Override
-    public ChangeDeviceStatusResponse changeDeviceStatus(String cardno, int type) {
+    public ChangeDeviceStatusResponse changeDeviceStatus(String orderId, int type) {
+        GoblinBraceletOrderVo orderVo = goblinRedisUtils.getBraceletOrderVo(orderId);
+        String cardno = orderVo.getCardno();
         String accessToken = this.getAccessToken();
         if (null != accessToken) {
-            // todo 更改订单状态为退款中
-            return thirdMaiZhiUtils.changeDeviceStatus(accessToken, cardno, type);
+            ChangeDeviceStatusResponse response = thirdMaiZhiUtils.changeDeviceStatus(accessToken, cardno, type);
+            if (response.getErrcode() == 200) {
+                orderVo.setStatus(3);
+                orderVo.setRefundStatus(0);
+                goblinRedisUtils.setBraceletOrderVo(orderVo);
+
+                LinkedList<String> sqls = CollectionUtil.linkedListString();
+                sqls.add(SqlMapping.get("goblin_bracelet_order_update_refund"));
+                LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();
+                sqlDataOrder.add(new Object[]{
+                        orderVo.getStatus(), orderVo.getRefundStatus(), "", LocalDateTime.now(), orderId
+                });
+                queueUtils.sendMsgByRedis(
+                        MQConst.GoblinQueue.GOBLIN_NFT_ORDER.getKey(),
+                        SqlMapping.gets(sqls, sqlDataOrder)
+                );
+            }
         }
         return null;
     }
@@ -210,10 +227,26 @@ public class GoblinRechargeWristbandServiceImpl extends ServiceImpl<GoblinRechar
                     if (null != res && res.getErrcode() == 200) {
                         GoblinBraceletOrderVo orderVo = goblinRedisUtils.getBraceletOrderVo(orderId);
                         if (res.getStatus() == 1) {
-
+                            orderVo.setStatus(4);
+                            orderVo.setRefundStatus(1);
+                            orderVo.setRefundStatusNote("");
                         } else if (res.getStatus() == 2) {
-
+                            orderVo.setStatus(7);
+                            orderVo.setRefundStatus(2);
+                            orderVo.setRefundStatusNote(res.getNote());
                         }
+                        goblinRedisUtils.setBraceletOrderVo(orderVo);
+
+                        LinkedList<String> sqls = CollectionUtil.linkedListString();
+                        sqls.add(SqlMapping.get("goblin_bracelet_order_update_refund"));
+                        LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();
+                        sqlDataOrder.add(new Object[]{
+                                orderVo.getStatus(), orderVo.getRefundStatus(), orderVo.getRefundStatusNote(), LocalDateTime.now()
+                        });
+                        queueUtils.sendMsgByRedis(
+                                MQConst.GoblinQueue.GOBLIN_NFT_ORDER.getKey(),
+                                SqlMapping.gets(sqls, sqlDataOrder)
+                        );
                     }
                 }
             }

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

@@ -200,4 +200,5 @@ goblin_bracelet_order_insert = INSERT INTO `goblin_bracelet_order`(`order_id`, `
 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