Merge remote-tracking branch 'origin/master'

cooleshow-cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -63,7 +63,7 @@
 				<if test="platformType != 'ADMIN'" >
 					and sni.status_ = 1
 					<if test="type != 5">
-						and sni.online_time_ &lt;= now()
+						and if(sni.online_time_ is not null,sni.online_time_ &lt;= now(),1=1)
 						and if(sni.offline_time_ is not null,sni.offline_time_ &gt;= now(),1=1)
 					</if>
 				</if>

cooleshow-mall/mall-admin/pom.xml

@@ -54,6 +54,13 @@
             <version>20.0</version>
             <scope>compile</scope>
         </dependency>
+
+
+
+        <dependency>
+            <groupId>com.yonge.cooleshow</groupId>
+            <artifactId>mall-pay</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/MallAdminApplication.java

@@ -16,7 +16,7 @@ import org.springframework.context.annotation.ComponentScan;
 @EnableDiscoveryClient
 @MapperScan({"com.yonge.cooleshow.admin.dao","com.yonge.cooleshow.mbg.mapper"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow.admin", "com.yonge.cooleshow.mbg", "com.yonge.cooleshow.mall.common",
-                               "com.yonge.cooleshow.common"})
+                               "com.yonge.cooleshow.common","com.yonge.cooleshow"})
 @EnableSwagger2Doc
 @EnableFeignClients("com.yonge.cooleshow")
 public class MallAdminApplication {

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/OmsOrderReturnApplyController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.yonge.cooleshow.enums.OrdeerCacherEnmu;
 import com.yonge.cooleshow.mall.common.api.CommonPage;
 import com.yonge.cooleshow.mall.common.api.CommonResult;
 import com.yonge.cooleshow.admin.dto.OmsOrderReturnApplyResult;
@@ -9,11 +10,16 @@ import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
 import com.yonge.cooleshow.admin.service.OmsOrderReturnApplyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 订单退货申请管理Controller
@@ -26,6 +32,11 @@ public class OmsOrderReturnApplyController {
     @Autowired
     private OmsOrderReturnApplyService returnApplyService;
 
+    @Autowired
+    private RedissonClient redissonClient;
+
+    private static final Logger log = LoggerFactory.getLogger(OmsOrderReturnApplyController.class);
+
     @ApiOperation("分页查询退货申请")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
@@ -59,10 +70,21 @@ public class OmsOrderReturnApplyController {
     @RequestMapping(value = "/update/status/{id}", method = RequestMethod.POST)
     @ResponseBody
     public CommonResult updateStatus(@PathVariable Long id, @RequestBody OmsUpdateStatusParam statusParam) {
-        int count = returnApplyService.updateStatus(id, statusParam);
-        if (count > 0) {
-            return CommonResult.success(count);
+        RLock lock = redissonClient.getLock(OrdeerCacherEnmu.LOCK_REFUND_ORDER_MALL + ":refundOrder:" + id);
+        try {
+            boolean b = lock.tryLock(60, 60, TimeUnit.SECONDS);
+            if (b) {
+                int count = returnApplyService.updateStatus(id, statusParam);
+                if (count > 0) {
+                    return CommonResult.success(count);
+                }
+            }
+        } catch (Exception e) {
+            log.error(e.getLocalizedMessage());
+            e.printStackTrace();
+            lock.unlock();
         }
+
         return CommonResult.failed();
     }
 

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/PaymentController.java

@@ -0,0 +1,62 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.huifu.adapay.core.AdapayCore;
+import com.huifu.adapay.core.util.AdapaySign;
+import com.yonge.cooleshow.admin.service.OmsOrderReturnApplyService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/11 18:16
+ */
+@RestController
+@RequestMapping("/payment")
+@Api(value = "付款接口", tags = "付款接口")
+public class PaymentController extends BaseController {
+    private final static Logger log = LoggerFactory.getLogger(PaymentController.class);
+
+    @Autowired
+    private OmsOrderReturnApplyService orderReturnApplyService;
+
+    /**
+     * 汇付回调
+     * 问题：1、成功失败需要回执什么信息 2、回调url地址是否需要加入白名单
+     * @author liweifan
+     * @param: request
+     * @updateTime 2022/3/11 18:35
+     */
+    @PostMapping("/callback")
+    public void callback(HttpServletRequest request) {
+        try {
+            //验签传参data
+            String data = request.getParameter("data");
+            //验签传参sign
+            String sign = request.getParameter("sign");
+            //验签传参publicKey
+            String publicKey = AdapayCore.PUBLIC_KEY;
+            //验签
+            boolean checkSign = AdapaySign.verifySign(data, sign, publicKey);
+            log.info("汇付回调，res is {}", data);
+            if (checkSign) {
+                //验签成功逻辑
+                log.info("验签成功");
+                String type = request.getParameter("type");
+                if (type.contains("refund")) {
+                    orderReturnApplyService.orderCallback(data);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/OmsOrderReturnApplyService.java

@@ -31,4 +31,11 @@ public interface OmsOrderReturnApplyService {
      * 获取指定申请详情
      */
     OmsOrderReturnApplyResult getItem(Long id);
+
+    /**
+     * 退款订单回调
+     *
+     * @param data
+     */
+    void orderCallback(String data);
 }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -1,17 +1,31 @@
 package com.yonge.cooleshow.admin.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.yonge.cooleshow.admin.dao.OmsOrderReturnApplyDao;
 import com.yonge.cooleshow.admin.dto.OmsOrderReturnApplyResult;
 import com.yonge.cooleshow.admin.dto.OmsReturnApplyQueryParam;
 import com.yonge.cooleshow.admin.dto.OmsUpdateStatusParam;
+import com.yonge.cooleshow.common.exception.BizException;
+import com.yonge.cooleshow.enums.PayStatusEnum;
 import com.yonge.cooleshow.mbg.mapper.OmsOrderReturnApplyMapper;
+import com.yonge.cooleshow.mbg.mapper.UserOrderPaymentMapper;
+import com.yonge.cooleshow.mbg.mapper.UserOrderRefundMapper;
 import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
 import com.yonge.cooleshow.mbg.model.OmsOrderReturnApplyExample;
 import com.yonge.cooleshow.admin.service.OmsOrderReturnApplyService;
+import com.yonge.cooleshow.mbg.model.UserOrderPayment;
+import com.yonge.cooleshow.mbg.model.UserOrderRefund;
+import com.yonge.cooleshow.sdk.req.OrderRefundReq;
+import com.yonge.cooleshow.sdk.res.OrderRefundRes;
+import com.yonge.cooleshow.service.PaymentService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
 
@@ -21,10 +35,23 @@ import java.util.List;
  */
 @Service
 public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyService {
+
+    private static final Logger log = LoggerFactory.getLogger(OmsOrderReturnApplyService.class);
+
     @Autowired
     private OmsOrderReturnApplyDao returnApplyDao;
     @Autowired
     private OmsOrderReturnApplyMapper returnApplyMapper;
+
+    @Autowired
+    private PaymentService adapayPaymentService;
+
+    @Autowired
+    private UserOrderPaymentMapper userOrderPaymentMapper;
+
+    @Autowired
+    private UserOrderRefundMapper userOrderRefundMapper;
+
     @Override
     public List<OmsOrderReturnApply> list(OmsReturnApplyQueryParam queryParam, Integer pageSize, Integer pageNum) {
         PageHelper.startPage(pageNum,pageSize);
@@ -41,6 +68,10 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
     @Override
     public int updateStatus(Long id, OmsUpdateStatusParam statusParam) {
         Integer status = statusParam.getStatus();
+        OmsOrderReturnApply omsOrderReturnApply = returnApplyMapper.selectByPrimaryKey(id);
+        if (omsOrderReturnApply.getStatus().equals(statusParam.getStatus())) {
+            return 1;
+        }
         OmsOrderReturnApply returnApply = new OmsOrderReturnApply();
         if(status.equals(1)){
             //确认退货
@@ -58,6 +89,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
             returnApply.setReceiveTime(new Date());
             returnApply.setReceiveMan(statusParam.getReceiveMan());
             returnApply.setReceiveNote(statusParam.getReceiveNote());
+            refundAmount(returnApply);
         }else if(status.equals(3)){
             //拒绝退货
             returnApply.setId(id);
@@ -71,8 +103,98 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
         return returnApplyMapper.updateByPrimaryKeySelective(returnApply);
     }
 
+    /**
+     * 退款处理
+     *
+     * @param returnApply 退款信息
+     */
+    private void refundAmount(OmsOrderReturnApply returnApply) {
+        // 退款
+        UserOrderPayment userOrderPayment = userOrderPaymentMapper.selectByOrderNo(returnApply.getOrderSn());
+        OrderRefundReq refundReq = new OrderRefundReq();
+        refundReq.setOrderNo(returnApply.getOrderSn());
+        refundReq.setRefundAmount(returnApply.getReturnAmount().setScale(2, RoundingMode.HALF_UP).toString());
+        refundReq.setReason(returnApply.getProductName());
+        refundReq.setTransNo(userOrderPayment.getTransNo());
+        OrderRefundRes orderRefundRes = adapayPaymentService.orderRefund(refundReq);
+        if (orderRefundRes.isStatus()) {
+            UserOrderRefund userOrderRefund = new UserOrderRefund();
+            userOrderRefund.setOrderNo(orderRefundRes.getRefundOrderNo());
+            userOrderRefund.setTransNo(orderRefundRes.getTransNo());
+            userOrderRefund.setPayTransNo(orderRefundRes.getPayTransNo());
+            userOrderRefund.setRefundAmt(new BigDecimal(orderRefundRes.getRefundAmount()));
+            userOrderRefund.setStatus(orderRefundRes.getRefundStatus().getCode());
+            userOrderRefundMapper.insert(userOrderRefund);
+        } else {
+            throw new BizException(orderRefundRes.getMessage());
+        }
+    }
+
     @Override
     public OmsOrderReturnApplyResult getItem(Long id) {
         return returnApplyDao.getDetail(id);
     }
+
+    @Override
+    public void orderCallback(String data) {
+        JSONObject hfRes = JSONObject.parseObject(data);
+        UserOrderRefund userOrderRefund = userOrderRefundMapper.selectByTransNo(hfRes.getString("id"));
+        if (null == userOrderRefund) {
+            log.error("汇付退款回调，订单未找到。 req is {}", data);
+            return;
+        }
+
+        if (!userOrderRefund.getStatus().equals(PayStatusEnum.pending.getCode())) {
+            log.error("汇付退款回调，订单状态异常。 req is {}", data);
+        }
+        if (PayStatusEnum.succeeded.getCode().equals(hfRes.getString("status"))) {
+            //退款成功
+            refundSuccess(userOrderRefund, hfRes);
+        } else {
+            // 退款失败
+            refundCancel(userOrderRefund,hfRes);
+        }
+    }
+
+    /**
+     * 退款失败
+     *
+     * @param userOrderRefund
+     * @param hfRes
+     */
+    private void refundCancel(UserOrderRefund userOrderRefund, JSONObject hfRes) {
+        userOrderRefund.setArrivalTime(new Date());
+        userOrderRefund.setStatus(PayStatusEnum.failed.getCode());
+        if (hfRes != null) {
+            try {
+                userOrderRefund.setPayFailMsg(hfRes.getString("error_msg"));
+            }catch (Exception e) {
+                log.error("退款订单，退款失败参数错误,参数{}", hfRes.toJSONString());
+            }
+        }
+        userOrderRefundMapper.updateByPrimaryKeySelective(userOrderRefund);
+    }
+
+    /**
+     * 退款成功
+     *
+     * @param userOrderRefund
+     * @param hfRes
+     */
+    private void refundSuccess(UserOrderRefund userOrderRefund, JSONObject hfRes) {
+
+        userOrderRefund.setArrivalTime(new Date());
+        userOrderRefund.setStatus(PayStatusEnum.succeeded.getCode());
+        if (hfRes != null) {
+            try {
+                userOrderRefund.setFeeAmt(hfRes.getBigDecimal("fee_amt"));
+                userOrderRefund.setRefundAmt(hfRes.getBigDecimal("pay_amt"));
+            }catch (Exception e) {
+                log.error("退款订单，金额格式化失败,参数{}", hfRes.toJSONString());
+            }
+        }
+        userOrderRefundMapper.updateByPrimaryKeySelective(userOrderRefund);
+
+
+    }
 }

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/mapper/UserOrderRefundMapper.java

@@ -0,0 +1,41 @@
+package com.yonge.cooleshow.mbg.mapper;
+
+import com.yonge.cooleshow.mbg.model.UserOrderRefund;
+import com.yonge.cooleshow.mbg.model.UserOrderRefundExample;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * Description
+ *
+ * @author: feng-ji
+ * @date: 2022-04-27
+ */
+public interface UserOrderRefundMapper {
+    long countByExample(UserOrderRefundExample example);
+
+    int deleteByExample(UserOrderRefundExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(UserOrderRefund record);
+
+    int insertSelective(UserOrderRefund record);
+
+    List<UserOrderRefund> selectByExample(UserOrderRefundExample example);
+
+    UserOrderRefund selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") UserOrderRefund record, @Param(
+            "example") UserOrderRefundExample example);
+
+    int updateByExample(@Param("record") UserOrderRefund record, @Param("example") UserOrderRefundExample example);
+
+    int updateByPrimaryKeySelective(UserOrderRefund record);
+
+    int updateByPrimaryKey(UserOrderRefund record);
+
+    UserOrderRefund selectByTransNo(@Param("transNo") String transNo);
+}

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/UserOrderPayment.java

@@ -38,6 +38,18 @@ public class UserOrderPayment implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date arrivalTime;
+
+    @ApiModelProperty("关单状态 pending 交易处理中 succeeded 交易成功 failed 交易失败")
+    private String closeStatus;
+
+    @ApiModelProperty("失败信息 ")
+    private String closeFailMsg;
+
+    @ApiModelProperty("关单时间 ")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date closeTime;
+
     @ApiModelProperty("创建时间 ")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@@ -47,7 +59,33 @@ public class UserOrderPayment implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-	public Long getId() {
+
+    public String getCloseStatus() {
+        return closeStatus;
+    }
+
+    public void setCloseStatus(String closeStatus) {
+        this.closeStatus = closeStatus;
+    }
+
+    public String getCloseFailMsg() {
+        return closeFailMsg;
+    }
+
+    public void setCloseFailMsg(String closeFailMsg) {
+        this.closeFailMsg = closeFailMsg;
+    }
+
+    public Date getCloseTime() {
+        return closeTime;
+    }
+
+    public void setCloseTime(Date closeTime) {
+        this.closeTime = closeTime;
+    }
+
+
+    public Long getId() {
         return id;
     }
 

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/UserOrderRefund.java

@@ -0,0 +1,163 @@
+package com.yonge.cooleshow.mbg.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* Description
+* @author: feng-ji
+* @date: 2022-04-27
+*/
+
+/**
+ * 平台订单退款表
+ */
+@ApiModel(value = "平台订单退款表")
+public class UserOrderRefund {
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    /**
+     * 退款流水号
+     */
+    @ApiModelProperty(value = "退款流水号")
+    private String transNo;
+
+    /**
+     * 支付流水号
+     */
+    @ApiModelProperty(value = "支付流水号")
+    private String payTransNo;
+
+    /**
+     * 交易金额，必须大于0，保留两位小数点，如0.10、100.05等
+     */
+    @ApiModelProperty(value = "交易金额，必须大于0，保留两位小数点，如0.10、100.05等")
+    private BigDecimal refundAmt;
+
+    /**
+     * 汇付收取的服务费
+     */
+    @ApiModelProperty(value = "汇付收取的服务费")
+    private BigDecimal feeAmt;
+
+    /**
+     * 交易状态 pending 交易处理中 succeeded 交易成功 failed 交易失败
+     */
+    @ApiModelProperty(value = "交易状态 pending 交易处理中 succeeded 交易成功 failed 交易失败")
+    private String status;
+
+    /**
+     * 失败信息
+     */
+    @ApiModelProperty(value = "失败信息")
+    private String payFailMsg;
+
+    /**
+     * 到账时间
+     */
+    @ApiModelProperty(value = "到账时间")
+    private Date arrivalTime;
+
+    @ApiModelProperty(value = "")
+    private Date createTime;
+
+    @ApiModelProperty(value = "")
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
+
+    public String getPayTransNo() {
+        return payTransNo;
+    }
+
+    public void setPayTransNo(String payTransNo) {
+        this.payTransNo = payTransNo;
+    }
+
+    public BigDecimal getRefundAmt() {
+        return refundAmt;
+    }
+
+    public void setRefundAmt(BigDecimal refundAmt) {
+        this.refundAmt = refundAmt;
+    }
+
+    public BigDecimal getFeeAmt() {
+        return feeAmt;
+    }
+
+    public void setFeeAmt(BigDecimal feeAmt) {
+        this.feeAmt = feeAmt;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getPayFailMsg() {
+        return payFailMsg;
+    }
+
+    public void setPayFailMsg(String payFailMsg) {
+        this.payFailMsg = payFailMsg;
+    }
+
+    public Date getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public void setArrivalTime(Date arrivalTime) {
+        this.arrivalTime = arrivalTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/UserOrderRefundExample.java

@@ -0,0 +1,917 @@
+package com.yonge.cooleshow.mbg.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+* Description
+* @author: feng-ji
+* @date: 2022-04-27
+*/
+public class UserOrderRefundExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public UserOrderRefundExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id_ =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id_ <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id_ >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id_ >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id_ <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id_ <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id_ in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id_ not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id_ between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id_ not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIsNull() {
+            addCriterion("order_no_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIsNotNull() {
+            addCriterion("order_no_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoEqualTo(String value) {
+            addCriterion("order_no_ =", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotEqualTo(String value) {
+            addCriterion("order_no_ <>", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThan(String value) {
+            addCriterion("order_no_ >", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+            addCriterion("order_no_ >=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThan(String value) {
+            addCriterion("order_no_ <", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThanOrEqualTo(String value) {
+            addCriterion("order_no_ <=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLike(String value) {
+            addCriterion("order_no_ like", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotLike(String value) {
+            addCriterion("order_no_ not like", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIn(List<String> values) {
+            addCriterion("order_no_ in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotIn(List<String> values) {
+            addCriterion("order_no_ not in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoBetween(String value1, String value2) {
+            addCriterion("order_no_ between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotBetween(String value1, String value2) {
+            addCriterion("order_no_ not between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoIsNull() {
+            addCriterion("trans_no_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoIsNotNull() {
+            addCriterion("trans_no_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoEqualTo(String value) {
+            addCriterion("trans_no_ =", value, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoNotEqualTo(String value) {
+            addCriterion("trans_no_ <>", value, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoGreaterThan(String value) {
+            addCriterion("trans_no_ >", value, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoGreaterThanOrEqualTo(String value) {
+            addCriterion("trans_no_ >=", value, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoLessThan(String value) {
+            addCriterion("trans_no_ <", value, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoLessThanOrEqualTo(String value) {
+            addCriterion("trans_no_ <=", value, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoLike(String value) {
+            addCriterion("trans_no_ like", value, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoNotLike(String value) {
+            addCriterion("trans_no_ not like", value, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoIn(List<String> values) {
+            addCriterion("trans_no_ in", values, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoNotIn(List<String> values) {
+            addCriterion("trans_no_ not in", values, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoBetween(String value1, String value2) {
+            addCriterion("trans_no_ between", value1, value2, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransNoNotBetween(String value1, String value2) {
+            addCriterion("trans_no_ not between", value1, value2, "transNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoIsNull() {
+            addCriterion("pay_trans_no_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoIsNotNull() {
+            addCriterion("pay_trans_no_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoEqualTo(String value) {
+            addCriterion("pay_trans_no_ =", value, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoNotEqualTo(String value) {
+            addCriterion("pay_trans_no_ <>", value, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoGreaterThan(String value) {
+            addCriterion("pay_trans_no_ >", value, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoGreaterThanOrEqualTo(String value) {
+            addCriterion("pay_trans_no_ >=", value, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoLessThan(String value) {
+            addCriterion("pay_trans_no_ <", value, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoLessThanOrEqualTo(String value) {
+            addCriterion("pay_trans_no_ <=", value, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoLike(String value) {
+            addCriterion("pay_trans_no_ like", value, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoNotLike(String value) {
+            addCriterion("pay_trans_no_ not like", value, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoIn(List<String> values) {
+            addCriterion("pay_trans_no_ in", values, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoNotIn(List<String> values) {
+            addCriterion("pay_trans_no_ not in", values, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoBetween(String value1, String value2) {
+            addCriterion("pay_trans_no_ between", value1, value2, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTransNoNotBetween(String value1, String value2) {
+            addCriterion("pay_trans_no_ not between", value1, value2, "payTransNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtIsNull() {
+            addCriterion("refund_amt_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtIsNotNull() {
+            addCriterion("refund_amt_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtEqualTo(BigDecimal value) {
+            addCriterion("refund_amt_ =", value, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtNotEqualTo(BigDecimal value) {
+            addCriterion("refund_amt_ <>", value, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtGreaterThan(BigDecimal value) {
+            addCriterion("refund_amt_ >", value, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("refund_amt_ >=", value, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtLessThan(BigDecimal value) {
+            addCriterion("refund_amt_ <", value, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("refund_amt_ <=", value, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtIn(List<BigDecimal> values) {
+            addCriterion("refund_amt_ in", values, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtNotIn(List<BigDecimal> values) {
+            addCriterion("refund_amt_ not in", values, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("refund_amt_ between", value1, value2, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundAmtNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("refund_amt_ not between", value1, value2, "refundAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtIsNull() {
+            addCriterion("fee_amt_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtIsNotNull() {
+            addCriterion("fee_amt_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtEqualTo(BigDecimal value) {
+            addCriterion("fee_amt_ =", value, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtNotEqualTo(BigDecimal value) {
+            addCriterion("fee_amt_ <>", value, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtGreaterThan(BigDecimal value) {
+            addCriterion("fee_amt_ >", value, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("fee_amt_ >=", value, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtLessThan(BigDecimal value) {
+            addCriterion("fee_amt_ <", value, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("fee_amt_ <=", value, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtIn(List<BigDecimal> values) {
+            addCriterion("fee_amt_ in", values, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtNotIn(List<BigDecimal> values) {
+            addCriterion("fee_amt_ not in", values, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("fee_amt_ between", value1, value2, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andFeeAmtNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("fee_amt_ not between", value1, value2, "feeAmt");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("status_ =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("status_ <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("status_ >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("status_ >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("status_ <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("status_ <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("status_ like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("status_ not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("status_ in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("status_ not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("status_ between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("status_ not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgIsNull() {
+            addCriterion("pay_fail_msg_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgIsNotNull() {
+            addCriterion("pay_fail_msg_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgEqualTo(String value) {
+            addCriterion("pay_fail_msg_ =", value, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgNotEqualTo(String value) {
+            addCriterion("pay_fail_msg_ <>", value, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgGreaterThan(String value) {
+            addCriterion("pay_fail_msg_ >", value, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgGreaterThanOrEqualTo(String value) {
+            addCriterion("pay_fail_msg_ >=", value, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgLessThan(String value) {
+            addCriterion("pay_fail_msg_ <", value, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgLessThanOrEqualTo(String value) {
+            addCriterion("pay_fail_msg_ <=", value, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgLike(String value) {
+            addCriterion("pay_fail_msg_ like", value, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgNotLike(String value) {
+            addCriterion("pay_fail_msg_ not like", value, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgIn(List<String> values) {
+            addCriterion("pay_fail_msg_ in", values, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgNotIn(List<String> values) {
+            addCriterion("pay_fail_msg_ not in", values, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgBetween(String value1, String value2) {
+            addCriterion("pay_fail_msg_ between", value1, value2, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayFailMsgNotBetween(String value1, String value2) {
+            addCriterion("pay_fail_msg_ not between", value1, value2, "payFailMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeIsNull() {
+            addCriterion("arrival_time_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeIsNotNull() {
+            addCriterion("arrival_time_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeEqualTo(Date value) {
+            addCriterion("arrival_time_ =", value, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeNotEqualTo(Date value) {
+            addCriterion("arrival_time_ <>", value, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeGreaterThan(Date value) {
+            addCriterion("arrival_time_ >", value, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("arrival_time_ >=", value, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeLessThan(Date value) {
+            addCriterion("arrival_time_ <", value, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeLessThanOrEqualTo(Date value) {
+            addCriterion("arrival_time_ <=", value, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeIn(List<Date> values) {
+            addCriterion("arrival_time_ in", values, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeNotIn(List<Date> values) {
+            addCriterion("arrival_time_ not in", values, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeBetween(Date value1, Date value2) {
+            addCriterion("arrival_time_ between", value1, value2, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArrivalTimeNotBetween(Date value1, Date value2) {
+            addCriterion("arrival_time_ not between", value1, value2, "arrivalTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time_ =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time_ <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time_ >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time_ >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time_ <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time_ <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time_ in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time_ not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time_ between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time_ not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time_ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time_ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time_ =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time_ <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time_ >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time_ >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time_ <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time_ <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time_ in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time_ not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time_ between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time_ not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

cooleshow-mall/mall-mbg/src/main/resources/config/mybatis/UserOrderPaymentMapper.xml

@@ -14,13 +14,16 @@
         <result column="status_" jdbcType="VARCHAR" property="status" />
         <result column="pay_fail_msg_" jdbcType="VARCHAR" property="payFailMsg" />
         <result column="arrival_time_" jdbcType="TIMESTAMP" property="arrivalTime" />
+        <result column="close_status_" jdbcType="TIMESTAMP" property="closeStatus" />
+        <result column="close_fail_msg_" jdbcType="TIMESTAMP" property="closeFailMsg" />
+        <result column="close_time_" jdbcType="TIMESTAMP" property="closeTime" />
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
         <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, order_no_, trans_no_, pay_channel_, pay_amt_, fee_amt_, pay_info_, status_,
-        pay_fail_msg_, arrival_time_, create_time_, update_time_
+        pay_fail_msg_, arrival_time_,close_status_,close_fail_msg_,close_time_,create_time_, update_time_
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         <!--@mbg.generated-->
@@ -39,11 +42,12 @@
         insert into user_order_payment (order_no_, trans_no_, pay_channel_,
         pay_amt_, fee_amt_, pay_info_,
         status_, pay_fail_msg_, arrival_time_,
-        create_time_, update_time_)
+        create_time_, update_time_,close_status_,close_fail_msg_,close_time_)
         values (#{orderNo,jdbcType=VARCHAR}, #{transNo,jdbcType=VARCHAR}, #{payChannel,jdbcType=VARCHAR},
         #{payAmt,jdbcType=DECIMAL}, #{feeAmt,jdbcType=DECIMAL}, #{payInfo,jdbcType=VARCHAR},
         #{status,jdbcType=VARCHAR}, #{payFailMsg,jdbcType=VARCHAR}, #{arrivalTime,jdbcType=TIMESTAMP},
-        #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+        #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{closeStatus},#{closeFailMsg}
+        ,#{closeTime})
     </insert>
     <insert id="insertSelective" keyColumn="id_" keyProperty="id" parameterType="com.yonge.cooleshow.mbg.model.UserOrderPayment" useGeneratedKeys="true">
         <!--@mbg.generated-->
@@ -82,6 +86,15 @@
             <if test="updateTime != null">
                 update_time_,
             </if>
+            <if test="closeStatus != null">
+                close_status_,
+            </if>
+            <if test="closeFailMsg != null">
+                close_fail_msg_,
+            </if>
+            <if test="closeTime != null">
+                close_time_,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNo != null">
@@ -117,6 +130,15 @@
             <if test="updateTime != null">
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="closeStatus != null">
+                #{closeStatus},
+            </if>
+            <if test="closeFailMsg != null">
+                #{closeFailMsg},
+            </if>
+            <if test="closeTime != null">
+                #{closeTime},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.yonge.cooleshow.mbg.model.UserOrderPayment">
@@ -156,6 +178,15 @@
             <if test="updateTime != null">
                 update_time_ = #{updateTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="closeStatus != null">
+                close_status_ = #{closeStatus},
+            </if>
+            <if test="closeFailMsg != null">
+                close_fail_msg_ = #{closeFailMsg},
+            </if>
+            <if test="closeTime != null">
+                close_time_ = #{closeTime,jdbcType=TIMESTAMP},
+            </if>
         </set>
         where id_ = #{id,jdbcType=BIGINT}
     </update>
@@ -172,7 +203,10 @@
         pay_fail_msg_ = #{payFailMsg,jdbcType=VARCHAR},
         arrival_time_ = #{arrivalTime,jdbcType=TIMESTAMP},
         create_time_ = #{createTime,jdbcType=TIMESTAMP},
-        update_time_ = #{updateTime,jdbcType=TIMESTAMP}
+        update_time_ = #{updateTime,jdbcType=TIMESTAMP},
+        close_status_ = #{closeStatus},
+        close_fail_msg_ = #{closeFailMsg},
+        close_time_ = #{closeTime,jdbcType=TIMESTAMP},
         where id_ = #{id,jdbcType=BIGINT}
     </update>
 

cooleshow-mall/mall-mbg/src/main/resources/config/mybatis/UserOrderRefundMapper.xml

@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yonge.cooleshow.mbg.mapper.UserOrderRefundMapper">
+  <resultMap id="BaseResultMap" type="com.yonge.cooleshow.mbg.model.UserOrderRefund">
+    <!--@mbg.generated-->
+    <!--@Table user_order_refund-->
+    <id column="id_" jdbcType="BIGINT" property="id" />
+    <result column="order_no_" jdbcType="VARCHAR" property="orderNo" />
+    <result column="trans_no_" jdbcType="VARCHAR" property="transNo" />
+    <result column="pay_trans_no_" jdbcType="VARCHAR" property="payTransNo" />
+    <result column="refund_amt_" jdbcType="DECIMAL" property="refundAmt" />
+    <result column="fee_amt_" jdbcType="DECIMAL" property="feeAmt" />
+    <result column="status_" jdbcType="VARCHAR" property="status" />
+    <result column="pay_fail_msg_" jdbcType="VARCHAR" property="payFailMsg" />
+    <result column="arrival_time_" jdbcType="TIMESTAMP" property="arrivalTime" />
+    <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--@mbg.generated-->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--@mbg.generated-->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id_, order_no_, trans_no_, pay_trans_no_, refund_amt_, fee_amt_, status_, pay_fail_msg_, 
+    arrival_time_, create_time_, update_time_
+  </sql>
+  <select id="selectByExample" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefundExample" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from user_order_refund
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from user_order_refund
+    where id_ = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from user_order_refund
+    where id_ = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefundExample">
+    <!--@mbg.generated-->
+    delete from user_order_refund
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefund" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into user_order_refund (order_no_, trans_no_, pay_trans_no_, 
+      refund_amt_, fee_amt_, status_, 
+      pay_fail_msg_, arrival_time_, create_time_, 
+      update_time_)
+    values (#{orderNo,jdbcType=VARCHAR}, #{transNo,jdbcType=VARCHAR}, #{payTransNo,jdbcType=VARCHAR}, 
+      #{refundAmt,jdbcType=DECIMAL}, #{feeAmt,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, 
+      #{payFailMsg,jdbcType=VARCHAR}, #{arrivalTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" keyColumn="id_" keyProperty="id" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefund" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into user_order_refund
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        order_no_,
+      </if>
+      <if test="transNo != null">
+        trans_no_,
+      </if>
+      <if test="payTransNo != null">
+        pay_trans_no_,
+      </if>
+      <if test="refundAmt != null">
+        refund_amt_,
+      </if>
+      <if test="feeAmt != null">
+        fee_amt_,
+      </if>
+      <if test="status != null">
+        status_,
+      </if>
+      <if test="payFailMsg != null">
+        pay_fail_msg_,
+      </if>
+      <if test="arrivalTime != null">
+        arrival_time_,
+      </if>
+      <if test="createTime != null">
+        create_time_,
+      </if>
+      <if test="updateTime != null">
+        update_time_,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="transNo != null">
+        #{transNo,jdbcType=VARCHAR},
+      </if>
+      <if test="payTransNo != null">
+        #{payTransNo,jdbcType=VARCHAR},
+      </if>
+      <if test="refundAmt != null">
+        #{refundAmt,jdbcType=DECIMAL},
+      </if>
+      <if test="feeAmt != null">
+        #{feeAmt,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="payFailMsg != null">
+        #{payFailMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="arrivalTime != null">
+        #{arrivalTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefundExample" resultType="java.lang.Long">
+    <!--@mbg.generated-->
+    select count(*) from user_order_refund
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--@mbg.generated-->
+    update user_order_refund
+    <set>
+      <if test="record.id != null">
+        id_ = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.orderNo != null">
+        order_no_ = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.transNo != null">
+        trans_no_ = #{record.transNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.payTransNo != null">
+        pay_trans_no_ = #{record.payTransNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.refundAmt != null">
+        refund_amt_ = #{record.refundAmt,jdbcType=DECIMAL},
+      </if>
+      <if test="record.feeAmt != null">
+        fee_amt_ = #{record.feeAmt,jdbcType=DECIMAL},
+      </if>
+      <if test="record.status != null">
+        status_ = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.payFailMsg != null">
+        pay_fail_msg_ = #{record.payFailMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.arrivalTime != null">
+        arrival_time_ = #{record.arrivalTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createTime != null">
+        create_time_ = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time_ = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--@mbg.generated-->
+    update user_order_refund
+    set id_ = #{record.id,jdbcType=BIGINT},
+      order_no_ = #{record.orderNo,jdbcType=VARCHAR},
+      trans_no_ = #{record.transNo,jdbcType=VARCHAR},
+      pay_trans_no_ = #{record.payTransNo,jdbcType=VARCHAR},
+      refund_amt_ = #{record.refundAmt,jdbcType=DECIMAL},
+      fee_amt_ = #{record.feeAmt,jdbcType=DECIMAL},
+      status_ = #{record.status,jdbcType=VARCHAR},
+      pay_fail_msg_ = #{record.payFailMsg,jdbcType=VARCHAR},
+      arrival_time_ = #{record.arrivalTime,jdbcType=TIMESTAMP},
+      create_time_ = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time_ = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefund">
+    <!--@mbg.generated-->
+    update user_order_refund
+    <set>
+      <if test="orderNo != null">
+        order_no_ = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="transNo != null">
+        trans_no_ = #{transNo,jdbcType=VARCHAR},
+      </if>
+      <if test="payTransNo != null">
+        pay_trans_no_ = #{payTransNo,jdbcType=VARCHAR},
+      </if>
+      <if test="refundAmt != null">
+        refund_amt_ = #{refundAmt,jdbcType=DECIMAL},
+      </if>
+      <if test="feeAmt != null">
+        fee_amt_ = #{feeAmt,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null">
+        status_ = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="payFailMsg != null">
+        pay_fail_msg_ = #{payFailMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="arrivalTime != null">
+        arrival_time_ = #{arrivalTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createTime != null">
+        create_time_ = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time_ = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id_ = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yonge.cooleshow.mbg.model.UserOrderRefund">
+    <!--@mbg.generated-->
+    update user_order_refund
+    set order_no_ = #{orderNo,jdbcType=VARCHAR},
+      trans_no_ = #{transNo,jdbcType=VARCHAR},
+      pay_trans_no_ = #{payTransNo,jdbcType=VARCHAR},
+      refund_amt_ = #{refundAmt,jdbcType=DECIMAL},
+      fee_amt_ = #{feeAmt,jdbcType=DECIMAL},
+      status_ = #{status,jdbcType=VARCHAR},
+      pay_fail_msg_ = #{payFailMsg,jdbcType=VARCHAR},
+      arrival_time_ = #{arrivalTime,jdbcType=TIMESTAMP},
+      create_time_ = #{createTime,jdbcType=TIMESTAMP},
+      update_time_ = #{updateTime,jdbcType=TIMESTAMP}
+    where id_ = #{id,jdbcType=BIGINT}
+  </update>
+
+  <select id="selectByTransNo" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from user_order_refund
+    where #{transNo} = trans_no_ limit 1
+  </select>
+</mapper>

cooleshow-mall/mall-pay/pom.xml

@@ -25,6 +25,19 @@
             <groupId>com.yonge.cooleshow</groupId>
             <artifactId>mall-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson</artifactId>
+            <version>3.16.4</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- redisson -->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.16.4</version>
+        </dependency>
     </dependencies>
 
 </project>

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/enums/OrdeerCacherEnmu.java

@@ -14,7 +14,10 @@ import java.time.Duration;
 public enum OrdeerCacherEnmu {
     LOCK_EXECUTE_ORDER("用户下单锁"),
     LOCK_PAY_ORDER("用户付款锁"),
-    LOCK_CHANGE_ACCOUNT("账户变更锁");
+    LOCK_CHANGE_ACCOUNT("账户变更锁"),
+    LOCK_REFUND_ORDER_MALL("商城退款锁"),
+
+    ;
 
     ;
     /***

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/sdk/PaymentSdk.java → cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/sdk/adapay/PaymentSdk.java

@@ -1,14 +1,16 @@
-package com.yonge.cooleshow.sdk;
+package com.yonge.cooleshow.sdk.adapay;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.huifu.adapay.model.Payment;
 import com.huifu.adapay.model.PaymentConfirm;
+import com.huifu.adapay.model.Refund;
 import com.yonge.cooleshow.common.constant.CommonConstants;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.config.HuifuConfiguration;
-import com.yonge.cooleshow.sdk.req.PaymentReq;
+import com.yonge.cooleshow.sdk.adapay.dto.PaymentReq;
+import com.yonge.cooleshow.sdk.adapay.dto.RefundReq;
 import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
 import com.yonge.toolset.utils.collection.MapUtil;
 import com.yonge.toolset.utils.http.HttpUtil;
@@ -168,54 +170,41 @@ public class PaymentSdk {
         }
     }
 
-/*
-    public static Map<String, Object> queryList(Integer pageIndex, Long createdGte, Long createdLte) throws Exception {
-        Map<String, Object> paymentParams = new HashMap<>();
-        paymentParams.put("app_id", ConfigInit.appId);
-        paymentParams.put("page_index", pageIndex);
-        paymentParams.put("page_size", "20");
-        paymentParams.put("created_gte", createdGte);
-        paymentParams.put("created_lte", createdLte);
-        Map<String, Object> payment = com.huifu.adapay.model.Payment.queryList(paymentParams);
-        String error_code = (String) payment.get("error_code");
-        if (null != error_code) {
-            String errorMsg = (String) payment.get("error_msg");
-            throw new ThirdpartyException(errorMsg);
-        }
-        return payment;
-    }
 
-    public static Map<String, Object> queryConfirmList(String paymentId) throws Exception {
-        Map<String, Object> paymentParams = new HashMap<>();
-        paymentParams.put("app_id", ConfigInit.appId);
-        paymentParams.put("payment_id", paymentId);
+    /**
+     * 退款
+     *
+     * @return 关闭的支付对象
+     */
+    public HttpResponseResult<Map<String, Object>> refundPayment(RefundReq refundReq) {
 
-        Map<String, Object> payment = com.huifu.adapay.model.Payment.queryConfirmList(paymentParams);
-        String error_code = (String) payment.get("error_code");
-        if (null != error_code) {
-            String errorMsg = (String) payment.get("error_msg");
-            throw new ThirdpartyException(errorMsg);
+        refundReq.setFail_fast("Y");
+        //创建分账对象
+        Map<String, String> div_member = new HashMap<>();
+        div_member.put("member_id", "0");
+        div_member.put("amount", refundReq.getRefund_amt());
+        div_member.put("fee_flag", "Y");
+        List<Map<String, String>> div_members = Arrays.asList(div_member);
+        refundReq.setDiv_members(JSONObject.toJSONString(div_members));
+
+        log.info("汇付[退款对象] Req：{}", JSONObject.toJSONString(refundReq));
+        //调用sdk方法，创建退款，得到退款对象
+        Map<String, Object> paymentParams = MapUtil.populateMap(new HashMap<>(), refundReq);
+        Map<String, Object> res;
+        try {
+            res = Refund.create(refundReq.getId(),paymentParams);
+        } catch (BaseAdaPayException e) {
+            return HttpResponseResult.failed(e.getMessage());
         }
-        return payment;
+        if (null == res) {
+            return HttpResponseResult.failed("请求失败");
+        }
+        log.info("汇付[创建退款对象] Resp：{}", res);
+        String errorCode = (String) res.get("error_code");
+        if (null != errorCode) {
+            String errorMsg = (String) res.get("error_msg");
+            return HttpResponseResult.failed(errorMsg);
+        }
+        return HttpResponseResult.succeed(res);
     }
-
-
-    public static Map<String, Object> getPayMap(BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody) throws Exception {
-        Map<String, Object> paymentParams = new LinkedHashMap<>();
-        paymentParams.put("appId", ConfigInit.appId);
-        paymentParams.put("amount", amount.setScale(2, BigDecimal.ROUND_HALF_UP));
-        paymentParams.put("orderNo", orderNo);
-//        paymentParams.put("notifyUrl", notifyUrl);
-//        paymentParams.put("returnUrl", returnUrl);
-        paymentParams.put("orderSubject", orderSubject);
-        paymentParams.put("orderBody", orderBody);
-        paymentParams.put("wxAppId", ConfigInit.wxAppId);
-
-        String originalStr = JSONObject.toJSONString(paymentParams);
-        String sign = DigestUtils.md5DigestAsHex(originalStr.getBytes());
-
-        paymentParams.put("sign", sign);
-        paymentParams.remove("appId");
-        return paymentParams;
-    }*/
 }

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/sdk/req/PaymentReq.java → cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/sdk/adapay/dto/PaymentReq.java

@@ -1,4 +1,6 @@
-package com.yonge.cooleshow.sdk.req;
+package com.yonge.cooleshow.sdk.adapay.dto;
+
+import com.yonge.cooleshow.sdk.req.DeviceInfo;
 
 import java.io.Serializable;
 import java.util.Map;

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/sdk/adapay/dto/RefundReq.java

@@ -0,0 +1,139 @@
+package com.yonge.cooleshow.sdk.adapay.dto;
+
+import com.yonge.cooleshow.sdk.req.DeviceInfo;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-04-27
+ */
+public class RefundReq implements Serializable {
+
+    /**
+     * 当支付确认成功后进行退款，请传入支付确认对象的id；当实时分账成功后进行退款，请传入支付对象的id。
+     *
+     * Y
+     */
+    private String id;
+
+    /**
+     * 请求订单号，只能为英文、数字或者下划线的一种或多种组合
+     *
+     * Y
+     */
+    private String refund_order_no;
+
+    /**
+     * 退款金额，若退款金额小于原交易金额，则认为是部分退款，必须大于0，保留两位小数点，如0.10、100.05等
+     *
+     * Y
+     */
+    private String refund_amt;
+
+    /**
+     * 退款描述
+     */
+    private String reason;
+
+    /**
+     * 扩展域
+     */
+    private String expend;
+
+    /**
+     * 前端设备信息
+     */
+    private DeviceInfo device_info;
+
+    /**
+     * 分账对象信息列表
+     */
+    private String div_members;
+
+    /**
+     * 异步通知地址，url为http/https路径，服务器POST回调，URL 上请勿附带参数
+     */
+    private String notify_url;
+
+    /**
+     * 快速失败标识：N 或者为空时-退款失败及时返回错误，仅支持实时分账场景；
+     * 为Y时，退款失败会走 Adapay 人工审核流程，核对后再次出款或回账，最晚 T+3 返回终态结果
+     */
+    private String fail_fast;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRefund_order_no() {
+        return refund_order_no;
+    }
+
+    public void setRefund_order_no(String refund_order_no) {
+        this.refund_order_no = refund_order_no;
+    }
+
+    public String getRefund_amt() {
+        return refund_amt;
+    }
+
+    public void setRefund_amt(String refund_amt) {
+        this.refund_amt = refund_amt;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public String getExpend() {
+        return expend;
+    }
+
+    public void setExpend(String expend) {
+        this.expend = expend;
+    }
+
+    public DeviceInfo getDevice_info() {
+        return device_info;
+    }
+
+    public void setDevice_info(DeviceInfo device_info) {
+        this.device_info = device_info;
+    }
+
+    public String getDiv_members() {
+        return div_members;
+    }
+
+    public void setDiv_members(String div_members) {
+        this.div_members = div_members;
+    }
+
+    public String getNotify_url() {
+        return notify_url;
+    }
+
+    public void setNotify_url(String notify_url) {
+        this.notify_url = notify_url;
+    }
+
+    public String getFail_fast() {
+        return fail_fast;
+    }
+
+    public void setFail_fast(String fail_fast) {
+        this.fail_fast = fail_fast;
+    }
+}

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/sdk/req/OrderPayReq.java

@@ -47,7 +47,7 @@ public class OrderPayReq {
 
     public void orderStatus(Integer orderStatus) {
         if (orderStatus == 0) {
-            this.orderStatus = OrderStatusEnum.WAIT_PAY;
+            this.orderStatus = OrderStatusEnum.PAYING;
         } else if (orderStatus == 1) {
             this.orderStatus = OrderStatusEnum.PAID;
         }else if (orderStatus == 2) {
@@ -59,9 +59,9 @@ public class OrderPayReq {
         }else if (orderStatus == 5) {
             this.orderStatus = OrderStatusEnum.CLOSE;
         }else if (orderStatus == 6) {
-            this.orderStatus = OrderStatusEnum.PAYING;
-        }else if (orderStatus == 7) {
-            this.orderStatus = OrderStatusEnum.FAIL;
+            this.orderStatus = OrderStatusEnum.WAIT_PAY;
+        } else {
+            this.orderStatus = OrderStatusEnum.CLOSE;
         }
     }
 

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/sdk/req/OrderRefundReq.java

@@ -0,0 +1,68 @@
+package com.yonge.cooleshow.sdk.req;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description 退款请求参数
+ *
+ * @author liujunchi
+ * @date 2022-04-27
+ */
+public class OrderRefundReq {
+
+    @ApiModelProperty("支付流水号")
+    private String transNo;
+
+
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
+    @ApiModelProperty("退款金额")
+    private String refundAmount;
+
+    @ApiModelProperty("退款描述")
+    private String reason;
+
+    @ApiModelProperty(value = "用户端公网ip ")
+    private String ipAddress;
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(String refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+}

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/sdk/res/OrderPayRes.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.sdk.res;
 
-import com.yonge.cooleshow.enums.OrderStatusEnum;
+import com.yonge.cooleshow.enums.PayStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -14,14 +14,17 @@ public class OrderPayRes {
     private String pay_amt;
     @ApiModelProperty("pay_info")
     private String pay_info;
+
     @ApiModelProperty("执行状态")
     private boolean status = true;
-    @ApiModelProperty("订单状态")
-    private OrderStatusEnum orderStatus;
 
     @ApiModelProperty("出错信息")
     private String message;
 
+    @ApiModelProperty("支付状态")
+    private PayStatusEnum payStatus;
+
+
     @ApiModelProperty("订单编号")
     private String orderNo;
 
@@ -55,14 +58,6 @@ public class OrderPayRes {
         this.status = status;
     }
 
-    public OrderStatusEnum getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(OrderStatusEnum orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-
     public String getMessage() {
         return message;
     }
@@ -71,6 +66,14 @@ public class OrderPayRes {
         this.message = message;
     }
 
+    public PayStatusEnum getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(PayStatusEnum payStatus) {
+        this.payStatus = payStatus;
+    }
+
     public String getOrderNo() {
         return orderNo;
     }

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/sdk/res/OrderRefundRes.java

@@ -0,0 +1,92 @@
+package com.yonge.cooleshow.sdk.res;
+
+import com.yonge.cooleshow.enums.PayStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-04-27
+ */
+@ApiModel("退款返回数据")
+public class OrderRefundRes {
+
+    @ApiModelProperty("退款流水号")
+    private String transNo;
+
+    @ApiModelProperty("支付流水号")
+    private String payTransNo;
+
+    @ApiModelProperty("订单号")
+    private String refundOrderNo;
+
+    @ApiModelProperty("退款金额")
+    private String refundAmount;
+
+    @ApiModelProperty("退款状态")
+    private PayStatusEnum refundStatus;
+
+    @ApiModelProperty("执行状态")
+    private boolean status = true;
+
+    @ApiModelProperty("出错信息")
+    private String message;
+
+    public String getRefundOrderNo() {
+        return refundOrderNo;
+    }
+
+    public void setRefundOrderNo(String refundOrderNo) {
+        this.refundOrderNo = refundOrderNo;
+    }
+
+    public boolean isStatus() {
+        return status;
+    }
+
+    public void setStatus(boolean status) {
+        this.status = status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
+
+    public String getPayTransNo() {
+        return payTransNo;
+    }
+
+    public void setPayTransNo(String payTransNo) {
+        this.payTransNo = payTransNo;
+    }
+
+    public String getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(String refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public PayStatusEnum getRefundStatus() {
+        return refundStatus;
+    }
+
+    public void setRefundStatus(PayStatusEnum status) {
+        this.refundStatus = status;
+    }
+}

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/service/PaymentService.java

@@ -1,8 +1,9 @@
 package com.yonge.cooleshow.service;
 
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.sdk.req.OrderPayReq;
+import com.yonge.cooleshow.sdk.req.OrderRefundReq;
 import com.yonge.cooleshow.sdk.res.OrderPayRes;
+import com.yonge.cooleshow.sdk.res.OrderRefundRes;
 
 /**
  * Description 支付服务
@@ -24,4 +25,6 @@ public interface PaymentService {
 
 
     OrderPayRes orderPayPaying(OrderPayReq payReq);
+
+    OrderRefundRes orderRefund(OrderRefundReq refundReq);
 }

cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/service/impl/AdapayPaymentServiceImpl.java

@@ -6,10 +6,13 @@ import com.yonge.cooleshow.config.HuifuConfiguration;
 import com.yonge.cooleshow.enums.OrderStatusEnum;
 import com.yonge.cooleshow.enums.PayChannelEnum;
 import com.yonge.cooleshow.enums.PayStatusEnum;
-import com.yonge.cooleshow.sdk.PaymentSdk;
+import com.yonge.cooleshow.sdk.adapay.PaymentSdk;
+import com.yonge.cooleshow.sdk.adapay.dto.RefundReq;
 import com.yonge.cooleshow.sdk.req.DeviceInfo;
 import com.yonge.cooleshow.sdk.req.OrderPayReq;
-import com.yonge.cooleshow.sdk.req.PaymentReq;
+import com.yonge.cooleshow.sdk.adapay.dto.PaymentReq;
+import com.yonge.cooleshow.sdk.req.OrderRefundReq;
+import com.yonge.cooleshow.sdk.res.OrderRefundRes;
 import com.yonge.cooleshow.sdk.res.OrderPayRes;
 import com.yonge.cooleshow.service.PaymentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,12 +85,11 @@ public class AdapayPaymentServiceImpl implements PaymentService {
             );
             String pay_info = ((JSONObject) res.get("expend")).getString("pay_info");
             orderPayRes.setPay_info(pay_info);
-            orderPayRes.setOrderStatus(OrderStatusEnum.PAYING);
-            orderPayRes.setPay_amt(payReq.getOrderPrice().setScale(2, RoundingMode.HALF_UP).toString());
+            orderPayRes.setPayStatus(PayStatusEnum.pending);
             return orderPayRes;
         } else {
             //入订单付款表，同时修改订单状态
-            orderPayRes.setOrderStatus(OrderStatusEnum.FAIL);
+            orderPayRes.setPayStatus(PayStatusEnum.failed);
             orderPayRes.setStatus(false);
             orderPayRes.setMessage(responseResult.getMsg());
             return orderPayRes;
@@ -106,4 +108,38 @@ public class AdapayPaymentServiceImpl implements PaymentService {
         }
         return orderPayRes;
     }
+
+    @Override
+    public OrderRefundRes orderRefund(OrderRefundReq orderRefundReq) {
+        RefundReq refundReq = new RefundReq();
+        refundReq.setRefund_order_no(orderRefundReq.getTransNo());
+        refundReq.setRefund_amt(orderRefundReq.getRefundAmount());
+        refundReq.setId(orderRefundReq.getTransNo());
+        refundReq.setReason(orderRefundReq.getReason());
+        DeviceInfo deviceInfo = new DeviceInfo();
+        deviceInfo.setDevice_ip(orderRefundReq.getIpAddress());
+
+        refundReq.setDevice_info(deviceInfo);
+
+        //异步通知地址
+        refundReq.setNotify_url(HuifuConfiguration.getHuifuProperties().getNotifyUrl());
+        //付款请求
+        HttpResponseResult<Map<String, Object>> responseResult = paymentSdk.refundPayment(refundReq);
+
+        OrderRefundRes  orderRefundRes = new OrderRefundRes();
+        if (responseResult.getStatus()) {
+            Map<String, Object> data = responseResult.getData();
+            orderRefundRes.setTransNo(data.get("id").toString());
+            orderRefundRes.setPayTransNo(data.get("payment_id").toString());
+            orderRefundRes.setRefundOrderNo(data.get("refund_order_no").toString());
+            orderRefundRes.setRefundAmount(new BigDecimal(data.get("refund_amt").toString())
+                                                   .setScale(2,RoundingMode.HALF_UP).toString());
+            orderRefundRes.setRefundStatus(PayStatusEnum.pending);
+
+        } else {
+            orderRefundRes.setStatus(false);
+            orderRefundRes.setMessage(responseResult.getMsg());
+        }
+        return orderRefundRes;
+    }
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/util/DistributedLock.java → cooleshow-mall/mall-pay/src/main/java/com/yonge/cooleshow/util/DistributedLock.java

@@ -1,4 +1,4 @@
-package com.yonge.cooleshow.portal.util;
+package com.yonge.cooleshow.util;
 
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;

cooleshow-mall/mall-portal/pom.xml

@@ -69,19 +69,6 @@
             <version>20.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>3.16.4</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- redisson -->
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.16.4</version>
-        </dependency>
 
     </dependencies>
 

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PaymentController.java

@@ -9,8 +9,8 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.enums.OrdeerCacherEnmu;
 import com.yonge.cooleshow.portal.service.OmsPortalOrderService;
-import com.yonge.cooleshow.portal.util.DistributedLock;
-import com.yonge.cooleshow.sdk.PaymentSdk;
+import com.yonge.cooleshow.util.DistributedLock;
+import com.yonge.cooleshow.sdk.adapay.PaymentSdk;
 import com.yonge.cooleshow.sdk.req.OrderPayReq;
 import com.yonge.cooleshow.sdk.res.OrderPayRes;
 import com.yonge.toolset.utils.web.WebUtil;
@@ -93,7 +93,10 @@ public class PaymentController extends BaseController {
             if (checkSign) {
                 //验签成功逻辑
                 log.info("验签成功");
-                portalOrderService.orderCallback(data);
+                String type = request.getParameter("type");
+                if (type.contains("payment")) {
+                    portalOrderService.orderCallback(data);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -18,14 +18,13 @@ import com.yonge.cooleshow.portal.dao.PortalOrderItemDao;
 import com.yonge.cooleshow.portal.dao.SmsCouponHistoryDao;
 import com.yonge.cooleshow.portal.domain.*;
 import com.yonge.cooleshow.portal.service.*;
-import com.yonge.cooleshow.sdk.PaymentSdk;
+import com.yonge.cooleshow.sdk.adapay.PaymentSdk;
 import com.yonge.cooleshow.sdk.req.OrderPayReq;
 import com.yonge.cooleshow.sdk.res.OrderPayRes;
 import com.yonge.cooleshow.service.PaymentService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -34,7 +33,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -209,8 +207,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         order.setPayType(orderParam.getPayType());
         //订单来源：0->PC订单；1->app订单
         order.setSourceType(1);
-        //订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
-        order.setStatus(0);
+        //订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 6 -> 未支付
+        order.setStatus(6);
         //订单类型：0->正常订单；1->秒杀订单
         order.setOrderType(0);
         //收货人信息：姓名、电话、邮编、地址
@@ -288,29 +286,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         if (CollectionUtils.isEmpty(timeOutOrders)) {
             return count;
         }
-        //修改订单状态为交易取消
-        List<Long> ids = new ArrayList<>();
-        for (OmsOrderDetail timeOutOrder : timeOutOrders) {
-            ids.add(timeOutOrder.getId());
-        }
-        portalOrderDao.updateOrderStatus(ids, 4);
         for (OmsOrderDetail timeOutOrder : timeOutOrders) {
-            //解除订单商品库存锁定
-            portalOrderDao.releaseSkuStockLock(timeOutOrder.getOrderItemList());
-            //修改优惠券使用状态
-            updateCouponStatus(timeOutOrder.getCouponId(), timeOutOrder.getMemberId(), 0);
-            //返还使用积分
-            if (timeOutOrder.getUseIntegration() != null) {
-                UmsMember member = memberService.getById(timeOutOrder.getMemberId());
-                memberService.updateIntegration(timeOutOrder.getMemberId(), member.getIntegration() + timeOutOrder.getUseIntegration());
-            }
 
-            UserOrderPayment orderPayment = userOrderPaymentService.getByOrderNo(timeOutOrder.getOrderSn());
-            if (null != orderPayment) {
-                //更新付款单
-                orderPayment.setStatus(OrderStatusEnum.FAIL.getCode());
-                orderPayment.setPayFailMsg("交易取消");
-                userOrderPaymentService.saveOrUpdate(orderPayment);
+            if (timeOutOrder.getStatus() == 0) {
+                payingOrderHandle(timeOutOrder);
+            } else if (timeOutOrder.getStatus() == 6) {
+                cancelOrder(timeOutOrder.getId());
             }
         }
         return timeOutOrders.size();
@@ -347,7 +328,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             UserOrderPayment orderPayment = userOrderPaymentService.getByOrderNo(cancelOrder.getOrderSn());
             if (null != orderPayment) {
                 //更新付款单
-                orderPayment.setStatus(OrderStatusEnum.FAIL.getCode());
+                orderPayment.setStatus(PayStatusEnum.failed.getCode());
                 orderPayment.setPayFailMsg("交易取消");
                 userOrderPaymentService.saveOrUpdate(orderPayment);
             }
@@ -489,15 +470,25 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         }
         // 支付中的返回拉起信息
         orderPayRes = adapayPaymentService.orderPay(payReq);
-        // 订单状态没变直接返回
-        if (payReq.getOrderStatus().getCode().equals(orderPayRes.getOrderStatus().getCode())) {
+        if (!orderPayRes.isStatus()) {
+            if (orderPayRes.getPayStatus() != null
+            && PayStatusEnum.failed.getCode().equals(orderPayRes.getPayStatus().getCode())) {
+                // 异常将取消订单
+                cancelOrder(detail.getId());
+            }
+            throw new BizException(orderPayRes.getMessage());
+        }
+        // 订单状态和付款状态都是付款中，直接返回付款拉起信息
+        if (OrderStatusEnum.PAYING.getCode().equals(payReq.getOrderStatus().getCode())
+                && PayStatusEnum.pending.getCode().equals(orderPayRes.getPayStatus().getCode())) {
             return orderPayRes;
         }
-        // 订单状态变了， 改支付状态 和订单支付表
+
+
         OmsOrder omsOrder = new OmsOrder();
         omsOrder.setId(detail.getId());
-        if (orderPayRes.getOrderStatus().getCode().equals(OrderStatusEnum.PAYING.getCode())) {
-            omsOrder.setStatus(6);
+        if (orderPayRes.getPayStatus().getCode().equals(OrderStatusEnum.PAYING.getCode())) {
+            omsOrder.setStatus(1);
             orderMapper.updateByPrimaryKeySelective(omsOrder);
             // 保存订单支付表
             if (userOrderPayment == null) {
@@ -508,7 +499,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             userOrderPayment.setTransNo(orderPayRes.getTransNo());
             userOrderPayment.setPayAmt(new BigDecimal(orderPayRes.getPay_amt()));
             userOrderPayment.setPayInfo(orderPayRes.getPay_info());
-            userOrderPayment.setStatus(orderPayRes.getOrderStatus().getCode());
+            userOrderPayment.setStatus(PayStatusEnum.pending.getCode());
             userOrderPayment.setPayFailMsg(orderPayRes.getMessage());
             userOrderPayment.setCreateTime(new Date());
             userOrderPayment.setUpdateTime(new Date());
@@ -531,9 +522,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                 log.error("汇付支付回调，订单未找到。 req is {}", data);
                 return;
             }
-            if (orderDetail.getStatus() == 0
-                    && orderDetail.getStatus() == 6
-                    && orderDetail.getStatus() == 7) {
+            if (orderDetail.getStatus() == 0) {
                 orderSuccess(orderDetail, hfRes);
             } else {
                 log.error("汇付支付回调，订单状态异常。 req is {}", data);
@@ -585,7 +574,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         } else if (orderPayment.getPayChannel().equals("wx_lite")) {
             paySuccess(detail.getId(),2);
         }
-        orderPayment.setStatus(OrderStatusEnum.PAID.getCode());
+        orderPayment.setStatus(PayStatusEnum.succeeded.getCode());
         orderPayment.setArrivalTime(new Date());
         if (null != hfRes) {
             try {

cooleshow-mall/mall-portal/src/main/resources/config/mybatis/PortalOrderDao.xml

@@ -44,8 +44,8 @@
             LEFT JOIN oms_order_item ot ON o.id = ot.order_id
         left join user_order_payment uop on uop.order_no_ = o.order_sn
         WHERE
-            (o.status = 0 AND o.create_time < date_add(NOW(), INTERVAL -#{orderMinute} MINUTE))
-            or (o.status = 6 and uop.create_time_ < date_add(NOW(), INTERVAL -#{payMinute} MINUTE));
+            (o.status = 6 AND o.create_time < date_add(NOW(), INTERVAL -#{orderMinute} MINUTE))
+            or (o.status = 0 and uop.create_time_ < date_add(NOW(), INTERVAL -#{payMinute} MINUTE));
     </select>
 
     <update id="updateSkuStock">

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/CancelTimeOutOrderTask.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.task.jobs;
 import com.yonge.cooleshow.task.core.BaseTask;
 import com.yonge.cooleshow.task.core.TaskException;
 import com.yonge.cooleshow.task.feign.MallPortalFeignService;
-import com.yonge.cooleshow.task.feign.StudentFeignService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UploadFileController.java

@@ -55,7 +55,14 @@ public class UploadFileController extends BaseController {
                     "2.提供js sdk中的key值,例\"key\":\"20150115/中文/${filename}\""),
             @ApiImplicitParam(name = "unknowValueField", dataType = "List", value = "对于用户无法确定表单值的放在unknownValueField中(比如有的上传控件会添加一些表单项,但表单项的值可能是随机的)"),
     })
-    @ApiOperation("获取上传文件签名")
+    @ApiOperation(value="获取上传文件签名",notes = "{\n" +
+            "    \"fileName\":\"aa\",\n" +
+            "    \"postData\":{\n" +
+            "        \"acl\":\"public-read\",\n" +
+            "        \"key\":\"20150115/中文/${filename}\"\n" +
+            "    },\n" +
+            "    \"unknowValueField\":[\"test\"]\n" +
+            "}")
     @PostMapping("/getUploadSign")
     public HttpResponseResult<PostObjectFormFields> getUploadSign(@RequestBody UploadSign uploadSign) {
         return succeed(uploadFileService.getUploadSign(uploadSign));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -358,7 +358,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
                 .lambdaQuery()
                 .eq(MusicSheetPurchaseRecord::getMusicSheetId, musicSheetId)
                 .eq(MusicSheetPurchaseRecord::getStudentId, userId)
-                .eq(MusicSheetPurchaseRecord::getOrderStatus, YesOrNoEnum.YES)
+                .eq(MusicSheetPurchaseRecord::getOrderStatus,OrderStatusEnum.PAID)
                 .list();
         if (!CollectionUtils.isEmpty(list)) {
             throw  new BizException("已经购买了当前曲目");

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonStudentVo.java

@@ -18,15 +18,7 @@ public class VideoLessonStudentVo extends BaseEntity {
     private List<VideoLessonGroupDetail> detailList;
 
     @ApiModelProperty(value = "true已买,false未买")
-    private Boolean isAlreadyBuy;
-
-    public Boolean getAlreadyBuy() {
-        return isAlreadyBuy;
-    }
-
-    public void setAlreadyBuy(Boolean alreadyBuy) {
-        isAlreadyBuy = alreadyBuy;
-    }
+    private Boolean alreadyBuy;
 
     public VideoLessonGroupVo getLessonGroup() {
         return lessonGroup;
@@ -43,4 +35,12 @@ public class VideoLessonStudentVo extends BaseEntity {
     public void setDetailList(List<VideoLessonGroupDetail> detailList) {
         this.detailList = detailList;
     }
+
+    public Boolean getAlreadyBuy() {
+        return alreadyBuy;
+    }
+
+    public void setAlreadyBuy(Boolean alreadyBuy) {
+        this.alreadyBuy = alreadyBuy;
+    }
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -247,6 +247,7 @@
 				(SELECT video_lesson_group_id_ FROM video_lesson_purchase_record WHERE student_id_=#{param.studentId} AND order_status_=1)
 			</if>
 		</where>
+		ORDER BY g.create_time_ DESC
 	</select>
 	<select id="queryGroupList" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonAuthGroup">
 		SELECT

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetController.java

@@ -146,7 +146,7 @@ public class MusicSheetController extends BaseController {
 
 
     /**
-     * 最近练习
+     * 检查实名认证
      */
     @GetMapping("/realNameAuth/check")
     @ApiOperation(value = "检查实名认证")

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/VideoLessonController.java

@@ -12,7 +12,6 @@ import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.LessonGroupVo;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonEvaluateVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupVo;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonStudentVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;