he2802 1 year ago
parent
commit
c526ecf988

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderHandleAddBo.java

@@ -52,7 +52,7 @@ public class OrderHandleAddBo {
     private Integer inputFrom;
     /** 支付状态:0待支付 1已支付 -1已关闭 */
     @ApiModelProperty("支付状态:0待支付 1已支付 -1已关闭  2审核中:对公支付提交审核中 -2不通过:对公支付审核不通过")
-    private Integer payStauts;
+    private Integer payStatus;
     /** 商品类型 */
     @ApiModelProperty("商品类型")
     private Integer goodsType;

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderHandleEditBo.java

@@ -62,7 +62,7 @@ public class OrderHandleEditBo {
 
     /** 支付状态:0待支付 1已支付 -1已关闭 */
     @ApiModelProperty("支付状态:0待支付 1已支付 -1已关闭  2审核中:对公支付提交审核中 -2不通过:对公支付审核不通过")
-    private Integer payStauts;
+    private Integer payStatus;
 
     /** 商品类型 */
     @ApiModelProperty("商品类型")

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderHandleQueryBo.java

@@ -62,7 +62,7 @@ public class OrderHandleQueryBo extends BaseEntity {
 	private Integer inputFrom;
 	/** 支付状态:0待支付 1已支付 -1已关闭 */
 	@ApiModelProperty("支付状态:0待支付 1已支付 -1已关闭  2审核中:对公支付提交审核中 -2不通过:对公支付审核不通过")
-	private Integer payStauts;
+	private Integer payStatus;
 	/** 商品类型 */
 	@ApiModelProperty("商品类型")
 	private Integer goodsType;

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderHandle.java

@@ -49,7 +49,7 @@ private static final long serialVersionUID=1L;
     /** 录单来源 1经办人下单 */
     private Integer inputFrom;
     /** 支付状态:0待支付 1已支付 -1已关闭  2审核中:对公支付提交审核中 -2不通过:对公支付审核不通过 */
-    private Integer payStauts;
+    private Integer payStatus;
     /** 商品类型 */
     private Integer goodsType;
     /** 订单标准价格 */

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderHandleServiceImpl.java

@@ -77,7 +77,7 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
         lqw.eq(bo.getBusinessId() != null, OrderHandle::getBusinessId, bo.getBusinessId());
         lqw.eq(bo.getProjectId() != null, OrderHandle::getProjectId, bo.getProjectId());
         lqw.eq(bo.getInputFrom() != null, OrderHandle::getInputFrom, bo.getInputFrom());
-        lqw.eq(bo.getPayStauts() != null, OrderHandle::getPayStauts, bo.getPayStauts());
+        lqw.eq(bo.getPayStatus() != null, OrderHandle::getPayStatus, bo.getPayStatus());
         lqw.eq(bo.getGoodsType() != null, OrderHandle::getGoodsType, bo.getGoodsType());
         return entity2Vo(this.list(lqw));
     }
@@ -168,7 +168,7 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
         if (Validator.isEmpty(orderHandle)) {
             throw new CustomException("录单单号不存在");
         }
-        if (orderHandle.getPayStauts()!=0) {
+        if (orderHandle.getPayStatus()!=0) {
             throw new CustomException("非支付状态");
         }
         if (orderHandle.getOverTime()<DateUtils.getNowTime()) {
@@ -205,7 +205,7 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
             objectLambdaUpdateWrapper.set(OrderHandle::getCompanyRemark,bo.getCompanyRemark());
             objectLambdaUpdateWrapper.set(OrderHandle::getCompanyPayImg,bo.getCompanyPayImg());
             objectLambdaUpdateWrapper.set(OrderHandle::getUpdateTime,DateUtils.getNowTime());
-            objectLambdaUpdateWrapper.set(OrderHandle::getPayStauts,2);
+            objectLambdaUpdateWrapper.set(OrderHandle::getPayStatus,2);
             objectLambdaUpdateWrapper.set(OrderHandle::getPayType,2);
             this.update(null, objectLambdaUpdateWrapper);
 

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderHandleVo.java

@@ -61,7 +61,7 @@ public class OrderHandleVo {
 	/** 支付状态:0待支付 1已支付 -1已关闭 */
 	@Excel(name = "支付状态:0待支付 1已支付 -1已关闭")
 	@ApiModelProperty("支付状态:0待支付 1已支付 -1已关闭  2审核中:对公支付提交审核中 -2不通过:对公支付审核不通过")
-	private Integer payStauts;
+	private Integer payStatus;
 	/** 商品类型 */
 	@Excel(name = "商品类型")
 	@ApiModelProperty("商品类型")

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -512,9 +512,9 @@ public class WxPayServiceImpl implements IWxPayService {
         }
         redisCache.setCacheObject(key, "dealing", 30, TimeUnit.SECONDS);//30秒
         OrderHandle orderHandle = iOrderHandleService.queryBySn(out_trade_no);
-        if (orderHandle != null && orderHandle.getPayStauts() == 0) {
+        if (orderHandle != null && orderHandle.getPayStatus() == 0) {
             orderHandle.setPayTime(DateUtils.getNowTime());
-            orderHandle.setPayStauts(1);
+            orderHandle.setPayStatus(1);
             orderHandle.setUpdateTime(DateUtils.getNowTime());
             if (iOrderHandleService.updateById(orderHandle)) {
                 List<Order> list = iOrderService.list(new LambdaQueryWrapper<Order>().eq(Order::getHandleOrderSn, out_trade_no));