收费管理

joying-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fzm-joying</artifactId>
         <groupId>com.fzm</groupId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </parent>
     <artifactId>joying-admin</artifactId>
 

joying-admin/src/main/java/com/fzm/admin/controller/ChargeController.java

+package com.fzm.admin.controller;
+
+import com.fzm.common.annotation.Authentication;
+import com.fzm.common.entity.Charge;
+import com.fzm.common.model.ResponseModel;
+import com.fzm.common.service.ChargeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/25 10:13
+ */
+@Authentication
+@RestController
+@RequestMapping(value = "/charge")
+@Api(tags = "收费管理")
+public class ChargeController {
+
+    @Resource
+    private ChargeService chargeService;
+
+    @PostMapping("/update")
+    @ApiOperation("编辑")
+    public ResponseModel<String> update(@RequestBody Charge charge) {
+        chargeService.updateById(charge);
+        return ResponseModel.success("编辑成功");
+    }
+
+    @GetMapping("/detail/{type}")
+    @ApiOperation("根据收费类型获取详情")
+    public ResponseModel<Charge> getByType(@ApiParam("收费类型 1-nft发行 2-版权申请") @PathVariable Integer type) {
+        Charge charge = chargeService.getByType(type);
+        return ResponseModel.success(charge);
+    }
+}

joying-common/src/main/java/com/fzm/common/entity/Charge.java

+package com.fzm.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/25 10:07
+ */
+@Data
+@TableName("tb_charge")
+public class Charge {
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("收费金额")
+    private Long fee;
+
+    @ApiModelProperty("收费类型 1-nft发行 2-版权申请")
+    private Integer type;
+}

joying-common/src/main/java/com/fzm/common/entity/Nft.java

@@ -73,6 +73,9 @@ public class Nft extends BaseEntity {
     @ApiModelProperty("nft发行时间")
     private Date publishTime;
 
+    @ApiModelProperty("发行状态 0-待支付 1-发行中 2-发行成功 3-发行失败")
+    private Integer publishStatus;
+
     @ApiModelProperty("交易转让hash")
     private String transferHash;
 

joying-common/src/main/java/com/fzm/common/entity/Payment.java

@@ -24,12 +24,12 @@ public class Payment {
     @ApiModelProperty("交易类型")
     private String tradeType;
 
-    @ApiModelProperty("交易状态")
-    private String tradeState;
-
     @ApiModelProperty("支付金额(分)")
     private Integer totalFee;
 
+    @ApiModelProperty("是否有退款, 0-否 1-是")
+    private Integer isRefund;
+
     @ApiModelProperty("商品订单编号")
     private String successTime;
 

joying-common/src/main/java/com/fzm/common/entity/Refund.java

+package com.fzm.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("tb_refund")
+public class Refund {
+
+    private Long id;
+
+    @ApiModelProperty("商品订单编号")
+    private Long orderId;
+
+    @ApiModelProperty("支付系统交易编号")
+    private String transactionId;
+
+    @ApiModelProperty("状态")
+    private String refundId;
+
+    @ApiModelProperty("退款状态  1- 退款中 2-退款成功 3-退款失败")
+    private Integer refundStatus;
+
+    @ApiModelProperty("当前退款单的退款入账方")
+    private String userReceivedAccount;
+
+    @ApiModelProperty("支付金额(分)")
+    private Long fee;
+
+    @ApiModelProperty("商品订单编号")
+    private String successTime;
+
+    @ApiModelProperty("通知参数")
+    private String content;
+
+    private Date createDate;
+
+    private Date updateDate;
+}
\ No newline at end of file

joying-common/src/main/java/com/fzm/common/entity/dto/OrderProcessMsg.java

@@ -13,6 +13,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class OrderProcessMsg {
 
+    private Long orderId;
+
     private Integer productId;
 
     private Integer payScene;

joying-common/src/main/java/com/fzm/common/entity/vo/OrderVo.java

+package com.fzm.common.entity.vo;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/24 16:44
+ */
+public class OrderVo {
+
+    private Long id;
+
+
+}

joying-common/src/main/java/com/fzm/common/enums/PublishStatus.java

+package com.fzm.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/24 17:19
+ *
+ * <p>
+ * nft发行状态
+ * </p>
+ */
+@Getter
+@AllArgsConstructor
+public enum PublishStatus {
+
+
+    TO_BE_PAY(0, "待支付"),
+    PUBLISHING(1, "发行中"),
+    SUSSED(2, "发行成功"),
+    FAILED(3, "发行失败");
+
+    private Integer code;
+    private String type;
+
+
+}

joying-common/src/main/java/com/fzm/common/enums/RefundStatus.java

+package com.fzm.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/24 15:02
+ */
+@Getter
+@AllArgsConstructor
+public enum RefundStatus {
+
+    REFUNDING(1),
+    SUCCESS(2),
+    FAINED(3),
+    ;
+
+    private Integer status;
+
+}

joying-common/src/main/java/com/fzm/common/enums/WxPayStatus.java

+package com.fzm.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/24 11:03
+ */
+@AllArgsConstructor
+@Getter
+public enum WxPayStatus {
+
+    SUCCESS("SUCCESS", "支付成功"),
+
+    REFUND("REFUND", "转入退款"),
+
+    NOTPAY("NOTPAY", "未支付"),
+
+    CLOSED("CLOSED", "已关闭"),
+
+    REVOKED("REVOKED", "已撤销（仅付款码支付会返回）"),
+
+    USERPAYING("USERPAYING", "用户支付中（仅付款码支付会返回）"),
+
+    PAYERROR("PAYERROR", "支付失败（仅付款码支付会返回）");
+
+    private String status;
+    private String desc;
+
+
+}

joying-common/src/main/java/com/fzm/common/mapper/ChargeMapper.java

+package com.fzm.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fzm.common.entity.Charge;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/25 10:10
+ */
+@Mapper
+public interface ChargeMapper extends BaseMapper<Charge> {
+}

joying-common/src/main/java/com/fzm/common/mapper/RefundMapper.java

+package com.fzm.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fzm.common.entity.Refund;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/24 14:27
+ */
+@Mapper
+public interface RefundMapper extends BaseMapper<Refund> {
+}

joying-common/src/main/java/com/fzm/common/service/ChargeService.java

+package com.fzm.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fzm.common.entity.Charge;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/25 10:10
+ */
+public interface ChargeService extends IService<Charge> {
+
+    /**
+     * 根据收费类型获取详情
+     *
+     * @param type
+     * @return
+     */
+    Charge getByType(Integer type);
+}

joying-common/src/main/java/com/fzm/common/service/CopyrightApplyService.java

@@ -64,7 +64,7 @@ public interface CopyrightApplyService extends IService<CopyrightApply> {
      *
      * @param copyrightDTO
      */
-    Boolean update(CopyrightDTO copyrightDTO);
+    Integer update(CopyrightDTO copyrightDTO);
 
     /**
      * 分页查询

joying-common/src/main/java/com/fzm/common/service/NftService.java

@@ -176,4 +176,10 @@ public interface NftService extends IService<Nft> {
      * @param isEntrust
      */
     void updateEntrust(String nftHash, Integer isEntrust);
+
+    /**
+     * 删除
+     * @param id
+     */
+    void delete(Integer id);
 }

joying-common/src/main/java/com/fzm/common/service/OrderService.java

@@ -5,6 +5,8 @@ import com.fzm.common.entity.Order;
 import com.fzm.common.entity.dto.OrderDto;
 import com.fzm.common.enums.OrderStatus;
 
+import java.util.List;
+
 /**
  * @author tangtuo
  * @date 2022/1/19 15:41
@@ -18,7 +20,7 @@ public interface OrderService extends IService<Order> {
      * @param productId
      * @return
      */
-    Order getByPaySceneAndProductId(Integer payScene, Integer productId);
+    Order getByPaySceneAndProductId(Integer payScene, Integer productId, Integer orderStatus);
 
     /**
      * 更新订单状态
@@ -30,15 +32,34 @@ public interface OrderService extends IService<Order> {
 
     /**
      * 下单
+     *
      * @param orderDto
      * @return
      */
     Long createOrder(OrderDto orderDto);
 
     /**
-     *
      * @param orderId
      * @param payType
      */
     Boolean updatePayType(Long orderId, Integer payType);
+
+    /**
+     * 取消订单
+     *
+     * @param orderId
+     * @param orderStatus
+     * @return
+     */
+    Boolean cancel(Long orderId, OrderStatus orderStatus);
+
+    /**
+     * 获取我的订单
+     *
+     * @param payScene
+     * @return
+     */
+    List<Order> listOrder(Integer payScene);
+
+    void processOrder(Long orderId, Integer productId, Integer payScene);
 }

joying-common/src/main/java/com/fzm/common/service/PaymentService.java

@@ -8,4 +8,6 @@ import com.fzm.common.entity.Payment;
  * @date 2022/1/20 16:40
  */
 public interface PaymentService extends IService<Payment> {
+
+    Payment getByOrderId(Long orderId);
 }

joying-common/src/main/java/com/fzm/common/service/RefundService.java

+package com.fzm.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fzm.common.entity.Refund;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/24 14:26
+ */
+public interface RefundService extends IService<Refund> {
+}

joying-common/src/main/java/com/fzm/common/service/WxPayService.java

@@ -33,9 +33,9 @@ public interface WxPayService {
      *
      * @param jsonObject
      */
-    void processOrder(JSONObject jsonObject) throws GeneralSecurityException;
+    void processOrder(JSONObject jsonObject) throws GeneralSecurityException, InterruptedException;
 
-    String queryOrder(Long orderId);
+    String queryOrder(Long orderId) throws IOException;
 
     /**
      * 退款
@@ -57,5 +57,5 @@ public interface WxPayService {
      *
      * @param jsonObject
      */
-    void processRefund(JSONObject jsonObject);
+    void processRefund(JSONObject jsonObject) throws InterruptedException;
 }

joying-common/src/main/java/com/fzm/common/service/impl/ChargeServiceImpl.java

+package com.fzm.common.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fzm.common.entity.Charge;
+import com.fzm.common.mapper.ChargeMapper;
+import com.fzm.common.service.ChargeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/25 10:11
+ */
+@Service
+public class ChargeServiceImpl extends ServiceImpl<ChargeMapper, Charge> implements ChargeService {
+
+
+    @Override
+    public Charge getByType(Integer type) {
+        QueryWrapper<Charge> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", type);
+        return getOne(queryWrapper);
+    }
+
+}

joying-common/src/main/java/com/fzm/common/service/impl/CopyrightApplyServiceImpl.java

@@ -249,7 +249,7 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper,
     }
 
     @Override
-    public Boolean update(CopyrightDTO copyrightDTO) {
+    public Integer update(CopyrightDTO copyrightDTO) {
         // 只有撤回 驳回和登记失败的才能编辑
         CopyrightApply copyright = this.getById(copyrightDTO.getId());
         if (CopyrightApplyState.REJECTED.getCode() != copyright.getRegisterState() &&
@@ -304,7 +304,8 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper,
         }
         copyrightApply.setApplyTime(new Date());
         copyrightApply.setRegisterState(CopyrightApplyState.TO_BE_PAY.getCode());
-        return updateById(copyrightApply);
+        this.updateById(copyrightApply);
+        return copyrightDTO.getId();
     }
 
     @Override

joying-common/src/main/java/com/fzm/common/service/impl/OrderServiceImpl.java

@@ -4,20 +4,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fzm.common.entity.Order;
 import com.fzm.common.entity.dto.OrderDto;
+import com.fzm.common.entity.dto.OrderProcessMsg;
 import com.fzm.common.enums.OrderStatus;
 import com.fzm.common.enums.PayScene;
-import com.fzm.common.enums.PayType;
 import com.fzm.common.mapper.OrderMapper;
 import com.fzm.common.service.CopyrightApplyService;
 import com.fzm.common.service.NftService;
 import com.fzm.common.service.OrderService;
 import com.fzm.common.utils.JwtUtil;
 import com.fzm.common.utils.SnowflakeUtil;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @author tangtuo
@@ -39,11 +41,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Resource
     private HttpServletRequest request;
 
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+
     @Override
-    public Order getByPaySceneAndProductId(Integer payScene, Integer productId) {
+    public Order getByPaySceneAndProductId(Integer payScene, Integer productId, Integer orderStatus) {
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("pay_scene", payScene)
-                .eq("product_id", productId);
+                .eq("product_id", productId)
+                .eq("order_status", orderStatus);
         return this.getOne(queryWrapper);
     }
 
@@ -61,19 +67,28 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         long id = snowflakeUtil.snowflakeId();
         Integer productId = orderDto.getProductId();
         String orderName;
-        if (PayScene.NFT.getCode().equals(orderDto.getPayScene())) {
+        Integer payScene = orderDto.getPayScene();
+        if (PayScene.NFT.getCode().equals(payScene)) {
             orderName = nftService.getById(productId).getName();
         } else {
             orderName = copyrightApplyService.getById(productId).getOpusName();
         }
         order.setId(id);
         order.setOrderName(orderName);
-        order.setPayScene(orderDto.getPayScene());
+        order.setPayScene(payScene);
         order.setOrderName(orderName);
         order.setFee(orderDto.getFee());
         order.setProductId(productId);
         order.setUserId(JwtUtil.getUserIdFromToken(request.getHeader("Authorization")));
-        order.setOrderStatus(OrderStatus.PAYING.getStatus());
+        Integer orderStatus;
+        if (orderDto.getFee() > 0) {
+            orderStatus = OrderStatus.PAYING.getStatus();
+        } else {
+            // 订单金额为0的话,创建订单时,状态为支付成功
+            orderStatus = OrderStatus.PAYED.getStatus();
+            processOrder(id, productId, payScene);
+        }
+        order.setOrderStatus(orderStatus);
         this.save(order);
         return id;
     }
@@ -85,4 +100,37 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         o.setPayType(payType);
         return updateById(o);
     }
+
+    @Override
+    public Boolean cancel(Long orderId, OrderStatus orderStatus) {
+        Order order = this.getById(orderId);
+        Integer productId = order.getProductId();
+        // 判断订单的类型
+        if (PayScene.NFT.getCode().equals(order.getPayScene())) {
+            // 删除nft的相关信息
+            nftService.delete(productId);
+        } else {
+            // 删除版权申请的相关信息
+            copyrightApplyService.delete(productId);
+        }
+        // 修改订单状态为取消
+        this.updateOrderStatus(orderId, orderStatus);
+        return true;
+    }
+
+    @Override
+    public List<Order> listOrder(Integer payScene) {
+        Integer userId = JwtUtil.getUserIdFromToken(request.getHeader("Authorization"));
+        QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("pay_scene", payScene);
+        queryWrapper.eq("user_id", userId);
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public void processOrder(Long orderId, Integer productId, Integer payScene) {
+        // 订单支付成功后,给mq发送一条消息,处理nft发行或版权申请的状态
+        OrderProcessMsg orderProcessMsg = new OrderProcessMsg(orderId, productId, payScene);
+        rabbitTemplate.convertAndSend("order-exchange", "order.process", orderProcessMsg);
+    }
 }

joying-common/src/main/java/com/fzm/common/service/impl/PaymentServiceImpl.java

 package com.fzm.common.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fzm.common.entity.Payment;
 import com.fzm.common.mapper.PaymentMapper;
@@ -14,4 +15,11 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(rollbackFor = RuntimeException.class)
 public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, Payment> implements PaymentService {
+
+    @Override
+    public Payment getByOrderId(Long orderId) {
+        QueryWrapper<Payment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("order_id", orderId);
+        return getOne(queryWrapper);
+    }
 }

joying-common/src/main/java/com/fzm/common/service/impl/RefundServiceImpl.java

+package com.fzm.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fzm.common.entity.Refund;
+import com.fzm.common.mapper.RefundMapper;
+import com.fzm.common.service.RefundService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/24 14:27
+ */
+@Service
+@Transactional(rollbackFor = RuntimeException.class)
+public class RefundServiceImpl extends ServiceImpl<RefundMapper, Refund> implements RefundService {
+}

joying-common/src/main/java/com/fzm/common/service/impl/WxPayServiceImpl.java

@@ -5,8 +5,10 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fzm.common.constant.SystemConstant;
 import com.fzm.common.entity.Order;
 import com.fzm.common.entity.Payment;
+import com.fzm.common.entity.Refund;
 import com.fzm.common.entity.dto.JsapiPayDto;
 import com.fzm.common.entity.dto.OrderProcessMsg;
 import com.fzm.common.enums.*;
@@ -18,6 +20,7 @@ import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -77,6 +80,9 @@ public class WxPayServiceImpl implements WxPayService {
     @Resource
     private SnowflakeUtil snowflakeUtil;
 
+    @Resource
+    private RefundService refundService;
+
     public Map<String, Object> payJsapi(JsapiPayDto jsapiPayDto) throws Exception {
         RLock lock = redisson.getLock("pay-" + jsapiPayDto.getOrderId());
         if (!lock.tryLock(10, TimeUnit.SECONDS)) {
@@ -177,14 +183,14 @@ public class WxPayServiceImpl implements WxPayService {
 
 
     @Override
-    public void processOrder(JSONObject jsonObject) {
+    public void processOrder(JSONObject jsonObject) throws InterruptedException {
         // 获取订单号
         Long out_trade_no = jsonObject.getLong("out_trade_no");
         // 加锁,避免接口幂等性问题
         RLock lock = redisson.getLock("pay-notify-" + out_trade_no);
-        lock.lock(10, TimeUnit.SECONDS);
         // 修改订单状态
         try {
+            if (lock.tryLock(10, TimeUnit.SECONDS)) {
                 Order order = orderService.getById(out_trade_no);
                 // 如果订单状态不是待支付,直接返回
                 if (!OrderStatus.PAYING.getStatus().equals(order.getOrderStatus())) {
@@ -193,7 +199,7 @@ public class WxPayServiceImpl implements WxPayService {
                 }
                 Integer productId = order.getProductId();
                 // 订单支付成功后,给mq发送一条消息,处理nft发行或版权申请的状态
-            OrderProcessMsg orderProcessMsg = new OrderProcessMsg(productId, order.getPayScene());
+                OrderProcessMsg orderProcessMsg = new OrderProcessMsg(out_trade_no, productId, order.getPayScene());
                 rabbitTemplate.convertAndSend("order-exchange", "order.process", orderProcessMsg);
                 // 修改订单状态
                 orderService.updateOrderStatus(out_trade_no, OrderStatus.PAYED);
@@ -204,9 +210,9 @@ public class WxPayServiceImpl implements WxPayService {
                 payment.setTotalFee(jsonObject.getJSONObject("amount").getInt("payer_total"));
                 payment.setTransactionId(jsonObject.getStr("transaction_id"));
                 payment.setSuccessTime(jsonObject.getStr("success_time"));
-            payment.setTradeState(jsonObject.getStr("trade_state"));
                 payment.setContent(JSONUtil.toJsonStr(jsonObject));
                 paymentService.save(payment);
+            }
         } finally {
             lock.unlock();
         }
@@ -214,9 +220,16 @@ public class WxPayServiceImpl implements WxPayService {
 
 
     @Override
-    public String queryOrder(Long orderId) {
-
-        return null;
+    public String queryOrder(Long orderId) throws IOException {
+        String url = String.format("https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/%s?mchid=%s", orderId, wxPayProperties.getMchId());
+        HttpGet httpGet = new HttpGet(url);
+        httpGet.setHeader("Accept", "application/json");
+        //完成签名并执行请求
+        CloseableHttpResponse response = httpClient.execute(httpGet);
+        String result = EntityUtils.toString(response.getEntity());
+        log.info("查询微信支付订单状态, 当前订单号: {}, 返回结果:{}", orderId, result);
+        JSONObject jsonObject = JSONUtil.parseObj(result);
+        return jsonObject.getStr("trade_state");
     }
 
     @Override
@@ -225,7 +238,7 @@ public class WxPayServiceImpl implements WxPayService {
         if (order == null || !order.getOrderStatus().equals(OrderStatus.PAYED.getStatus())) {
             throw GlobalException.newException(ResultCode.REFUND_FAILED, "当前订单未支付成功");
         }
-        String out_refund_no = "refund-" + snowflakeUtil.snowflakeId();
+        Long out_refund_no = snowflakeUtil.snowflakeId();
         String url = "https://api.mch.weixin.qq.com/v3/refund/domestic/refunds";
         HttpPost httpPost = new HttpPost(url);
         httpPost.addHeader("Accept", "application/json");
@@ -233,9 +246,7 @@ public class WxPayServiceImpl implements WxPayService {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         ObjectMapper objectMapper = new ObjectMapper();
         ObjectNode rootNode = objectMapper.createObjectNode();
-        rootNode.put("mchid", wxPayProperties.getMchId())
-                .put("appid", wxPayProperties.getAppId())
-                .put("out_refund_no", out_refund_no)
+        rootNode.put("out_refund_no", String.valueOf(out_refund_no))
                 .put("notify_url", wxPayProperties.getRefundNotifyUrl())
                 .put("out_trade_no", String.valueOf(orderId));
         rootNode.putObject("amount")
@@ -248,10 +259,19 @@ public class WxPayServiceImpl implements WxPayService {
         httpPost.setEntity(new StringEntity(bos.toString("UTF-8"), "UTF-8"));
         CloseableHttpResponse response = httpClient.execute(httpPost);
         String bodyAsString = EntityUtils.toString(response.getEntity());
+        log.info("退款接口返回参数: {}", bodyAsString);
         JSONObject jsonObject = JSONUtil.parseObj(bodyAsString);
         // 修改订单状态为退款中
         orderService.updateOrderStatus(orderId, OrderStatus.REFUNDING);
-
+        // 插入退款信息
+        Refund refund = new Refund();
+        refund.setId(out_refund_no);
+        refund.setFee(order.getFee());
+        refund.setOrderId(orderId);
+        refund.setRefundId(jsonObject.getStr("refund_id"));
+        refund.setTransactionId(jsonObject.getStr("transaction_id"));
+        refund.setUserReceivedAccount(jsonObject.getStr("user_received_account"));
+        refundService.save(refund);
     }
 
     @Override
@@ -264,23 +284,37 @@ public class WxPayServiceImpl implements WxPayService {
             String plainText = this.decrypt(resource);
             log.info("解密后的明文信息为: {}", plainText);
             JSONObject obj = JSONUtil.parseObj(plainText);
-            processRefund(jsonObject);
-            return null;
+            processRefund(obj);
+            return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             return false;
         }
     }
 
     @Override
-    public void processRefund(JSONObject jsonObject) {
-        Long out_trade_no = jsonObject.getLong("out_trade_no");
+    public void processRefund(JSONObject obj) throws InterruptedException {
+        Long out_trade_no = obj.getLong("out_trade_no");
+        Long out_refund_no = obj.getLong("out_refund_no");
         RLock lock = redisson.getLock("refund-" + out_trade_no);
-        lock.lock(10, TimeUnit.SECONDS);
         try {
-            // 修改订单未退款成功
+            if (lock.tryLock(10, TimeUnit.SECONDS)) {
+                Refund refund = refundService.getById(out_refund_no);
+                if (RefundStatus.SUCCESS.getStatus().equals(refund.getRefundStatus())) {
+                    return;
+                }
+                // 更新退款信息
+                refund.setRefundStatus(RefundStatus.SUCCESS.getStatus());
+                refund.setSuccessTime(obj.getStr("success_time"));
+                refund.setContent(JSONUtil.toJsonStr(obj));
+                refundService.updateById(refund);
+                // 更新流水的退款状态
+                Payment payment = paymentService.getByOrderId(out_trade_no);
+                payment.setIsRefund(SystemConstant.BOOLEAN_DATA_TRUE);
+                paymentService.updateById(payment);
+                // 修改订单状态为退款成功
                 orderService.updateOrderStatus(out_trade_no, OrderStatus.REFUNDED);
-            // 保存流水信息
+            }
         } finally {
             lock.unlock();
         }

joying-portal/src/main/java/com/fzm/portal/TestController.java

-package com.fzm.portal;
-
-import com.fzm.common.entity.dto.OrderProcessMsg;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.scheduling.support.SimpleTriggerContext;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * @author tangtuo
- * @date 2022/1/21 16:28
- */
-@Slf4j
-@RestController
-@RequestMapping("/test")
-public class TestController {
-
-    @Resource
-    private RabbitTemplate rabbitTemplate;
-
-    @GetMapping("/send")
-    public String send(){
-        log.info("发送消息: {}",123);
-        rabbitTemplate.convertAndSend("nft-exchange", "nft.publish", 123);
-        return "SUCCESS";
-    }
-
-}

joying-portal/src/main/java/com/fzm/portal/controller/ChargeController.java

+package com.fzm.portal.controller;
+
+import com.fzm.common.annotation.Authentication;
+import com.fzm.common.entity.Charge;
+import com.fzm.common.model.ResponseModel;
+import com.fzm.common.service.ChargeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author tangtuo
+ * @date 2022/1/25 10:13
+ */
+@Authentication
+@RestController
+@RequestMapping(value = "/charge")
+@Api(tags = "收费管理")
+public class ChargeController {
+
+    @Resource
+    private ChargeService chargeService;
+
+
+    @GetMapping("/fee/{type}")
+    @ApiOperation("根据收费类型查询收费")
+    public ResponseModel<Long> getByType(@ApiParam("收费类型 1-nft发行 2-版权申请") @PathVariable Integer type) {
+        Charge charge = chargeService.getByType(type);
+        return ResponseModel.success(charge.getFee());
+    }
+}

joying-portal/src/main/java/com/fzm/portal/controller/CopyrightApplyController.java

@@ -78,7 +78,7 @@ public class CopyrightApplyController {
     @Authentication
     @PostMapping(value = "/update")
     @ApiOperation(value = "编辑")
-    public ResponseModel<Boolean> update(@RequestBody CopyrightDTO copyrightDTO) {
+    public ResponseModel<Integer> update(@RequestBody CopyrightDTO copyrightDTO) {
         return ResponseModel.success(copyrightApplyService.update(copyrightDTO));
     }
 

joying-portal/src/main/java/com/fzm/portal/controller/OrderController.java

 package com.fzm.portal.controller;
 
 import com.fzm.common.annotation.Authentication;
+import com.fzm.common.entity.Order;
 import com.fzm.common.entity.dto.OrderDto;
+import com.fzm.common.enums.OrderStatus;
 import com.fzm.common.model.ResponseModel;
 import com.fzm.common.service.OrderService;
 import io.swagger.annotations.Api;
@@ -9,8 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 
 /**
  * @author tangtuo
@@ -39,4 +40,22 @@ public class OrderController {
     public ResponseModel<Integer> queryOrderStatus(@PathVariable Long orderId) {
         return ResponseModel.success(orderService.getById(orderId).getOrderStatus());
     }
+
+
+    @PostMapping("/cancel")
+    @ApiOperation("取消订单")
+    public ResponseModel<Boolean> cancelOrder(@RequestParam Long orderId) {
+        Boolean result = orderService.cancel(orderId, OrderStatus.CANCEL);
+        return ResponseModel.success(result);
+    }
+
+
+    @GetMapping("/list/{payScene}")
+    @ApiOperation(value = "获取我的订单列表")
+    public ResponseModel<List<Order>> listOrder(@PathVariable Integer payScene) {
+        List<Order> orders = orderService.listOrder(payScene);
+        return ResponseModel.success(orders);
+    }
+
+
 }

joying-portal/src/main/java/com/fzm/portal/controller/WxPayController.java

@@ -71,5 +71,11 @@ public class WxPayController {
     }
 
 
+    @GetMapping("/refund/{orderId}")
+    public ResponseModel<String> refund(@PathVariable Long orderId) throws IOException {
+        wxPayService.refund(orderId);
+        return ResponseModel.success("退款成功");
+    }
+
 
 }

joying-portal/src/main/java/com/fzm/portal/listener/NftListener.java

@@ -5,18 +5,26 @@ import cn.fzm.chain.simplesdk.constant.TxStatusEnum;
 import cn.fzm.chain.simplesdk.model.TxResult;
 import com.fzm.common.constant.SystemConstant;
 import com.fzm.common.entity.Nft;
+import com.fzm.common.entity.Order;
 import com.fzm.common.entity.User;
 import com.fzm.common.entity.dto.NftPublishMsg;
+import com.fzm.common.enums.OrderStatus;
+import com.fzm.common.enums.PayScene;
+import com.fzm.common.enums.PublishStatus;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
 import com.fzm.common.service.NftService;
+import com.fzm.common.service.OrderService;
 import com.fzm.common.service.UserService;
+import com.fzm.common.service.WxPayService;
 import com.fzm.common.utils.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.Date;
 
 /**
@@ -39,15 +47,22 @@ public class NftListener {
     @Resource
     private RedisUtil redisUtil;
 
+    @Resource
+    private OrderService orderService;
+
+    @Resource
+    private WxPayService wxPayService;
+
     /**
      * 监听nft发行结果
      *
      * @param msg
      */
     @RabbitListener(queues = "nft.publish.queue")
-    public void listenNftPublish(NftPublishMsg msg) {
+    public void listenNftPublish(NftPublishMsg msg) throws IOException {
         log.info("收到处理确认nft发行结果的消息: {}", msg);
         Nft nft = nftService.getById(msg.getId());
+        try {
             User user = userService.getUserByWallet(nft.getPublishAddress());
             String hash = msg.getHash();
             // 确认交易结果
@@ -56,13 +71,13 @@ public class NftListener {
                 throw GlobalException.newException(ResultCode.PUBLISH_ERROR, txResult.getErrMsg().getValue());
             }
             String realHash = paraChainClient.getRealTxHashFromGrp(hash);
-        /*TxResult txResult = paraChainClient.cycleConfirmTxWithHash(realHash, false, 1000);
-        if (!TxStatusEnum.SUCCESS.equals(txResult.getStatus())) {
-            throw GlobalException.newException(ResultCode.PUBLISH_ERROR, txResult.getErrMsg().getValue());
-        }*/
+            if (StringUtils.isBlank(realHash)) {
+                throw GlobalException.newException(ResultCode.PUBLISH_ERROR);
+            }
             nft.setNftHash(realHash);
             nft.setTokenId(msg.getTokenId());
             nft.setPublishTime(new Date());
+            nft.setPublishStatus(PublishStatus.SUSSED.getCode());
             nftService.updateById(nft);
             // 如果用户是第一次发行作品,把用户的isPublish修改成1,并清空用户统计的缓存信息
             if (SystemConstant.BOOLEAN_DATA_FALSE.equals(user.getIsPublish())) {
@@ -70,5 +85,15 @@ public class NftListener {
                 userService.updateById(u);
                 redisUtil.delete("user::statistic");
             }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            // nft发行失败,需要把nft的发行状态改成failed,然后主动发起退款
+            nft.setPublishStatus(PublishStatus.FAILED.getCode());
+            nftService.updateById(nft);
+            Order order = orderService.getByPaySceneAndProductId(PayScene.NFT.getCode(), nft.getId(), OrderStatus.PAYED.getStatus());
+            if (order != null) {
+                wxPayService.refund(order.getId());
+            }
+        }
     }
 }

joying-portal/src/main/java/com/fzm/portal/listener/OrderListener.java

@@ -5,11 +5,13 @@ import com.fzm.common.enums.CopyrightApplyState;
 import com.fzm.common.enums.PayScene;
 import com.fzm.common.service.CopyrightApplyService;
 import com.fzm.common.service.NftService;
+import com.fzm.common.service.WxPayService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 
 /**
  * @author tangtuo
@@ -25,9 +27,13 @@ public class OrderListener {
     @Resource
     private CopyrightApplyService copyrightApplyService;
 
+    @Resource
+    private WxPayService wxPayService;
+
     @RabbitListener(queues = "order.process.queue")
-    public void listenProcessOrder(OrderProcessMsg msg) {
+    public void listenProcessOrder(OrderProcessMsg msg) throws IOException {
         log.info("收到处理订单的消息: {}", msg);
+        try {
             if (PayScene.NFT.getCode().equals(msg.getPayScene())) {
                 // 如果支付场景是发行nft的话,需要把此订单的nft发行
                 nftService.publish(msg.getProductId());
@@ -35,6 +41,10 @@ public class OrderListener {
                 // 如果支付场景是版权申请的话,需要把当前订单对应的版权状态改为待核验
                 copyrightApplyService.updateRegisterState(msg.getProductId(), CopyrightApplyState.TO_BE_REVIEWED.getCode());
             }
+        } catch (Exception e) {
+            // 处理失败,需要主动发起退款
+            wxPayService.refund(msg.getOrderId());
+        }
     }
 
 }

joying-portal/src/main/resources/application-nj.yml

@@ -126,5 +126,5 @@ wx-pay:
   api-v3-key: D864DA53FEF8ACD41519064967DC10D2
   mch-serial-num: 72A62544B0A08A214FAEC780108692EDC6E7D5FA
   private-key-path: apiclient_key.pem
-  pay-notify-url: https://test.inmvo.com:8985/proxyApi/wx-pay/notify/jsapi
-  refund-notify-url: https://test.inmvo.com:8985/proxyApi/wx-pay/notify/refund
+  pay-notify-url: https://test.inmvo.com/proxyApi/wx-pay/notify/jsapi
+  refund-notify-url: https://test.inmvo.com/proxyApi/wx-pay/notify/refund

joying-portal/src/test/java/com/fzm/portal/WxPayTest.java

@@ -53,8 +53,8 @@ public class WxPayTest {
 
     @Test
     public void testH5Pay() throws IOException {
-        OrderProcessMsg orderProcessMsg = new OrderProcessMsg(1, 1);
-        rabbitTemplate.convertAndSend("order-exchange", "order.process", orderProcessMsg);
+//        OrderProcessMsg orderProcessMsg = new OrderProcessMsg(1, 1);
+//        rabbitTemplate.convertAndSend("order-exchange", "order.process", orderProcessMsg);
 //        for (int i = 0; i < 10; i++) {
 //            log.info(String.valueOf(snowflakeUtil.snowflakeId()));//       }
 //        String url = "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi";

sql/joying.sql

@@ -611,3 +611,8 @@ CREATE TABLE `tb_order` (
                             `update_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                             PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+-- v2.3.0
+alter table tb_nft add column publish_status TINYINT(1) not null default 1 comment '发行状态 1-待支付 2-发行成功 3-发行失败' after publish_time;
+update tb_nft set publish_status =2 where nft_hash !='';
\ No newline at end of file