fix

netflix-service/src/main/java/com/cyksj/service/order/impl/GoodsWholesalePayServiceImpl.java

@@ -154,7 +154,6 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 			return aliPayCommonService.aliPayUnifiedWholesaleDeposit(re, productCode, qrPayMode);
 		}
 		return aliPayCommonService.aliPayUnifiedWholesale(re, productCode, qrPayMode);
-
 	}
 
 	@Override
@@ -178,7 +177,7 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 		//买家支付宝账号
 		String buyerId = Optional.ofNullable(params.get("buyer_id")).orElse(params.get("buyer_open_id"));
 		log.info("批发支付宝回调信息:{}", Jsons.toJson(params));
-		if (!orderDon.getStatus().equals(UpgradeOrderDon.Status.noPayment) && !orderDon.getStatus().equals(UpgradeOrderDon.Status.close)) {
+		if (!orderDon.getStatus().equals(GoodsWholesaleOrderDon.Status.noPayment) && !orderDon.getStatus().equals(GoodsWholesaleOrderDon.Status.close)) {
 			log.info("批发支付宝已回调，重复修改状态 id:{}", orderDon.getId());
 			return;
 		}
@@ -187,6 +186,7 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 			payTime = DateUtil.parse(payTimeStr, "yyyy-MM-dd HH:mm:ss");
 		}
 		// 更改订单状态
+		orderDon.setStatus(GoodsWholesaleOrderDon.Status.hasPayment);
 		orderDon.setTransactionId(transactionId);
 		orderDon.setPayTime(payTime);
 		orderDon.setShopId(appId);
@@ -323,7 +323,7 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 		//买家支付宝账号
 		String buyerId = Optional.ofNullable(params.get("buyer_id")).orElse(params.get("buyer_open_id"));
 		log.info("押金支付宝回调信息:{}", Jsons.toJson(params));
-		if (!orderDon.getStatus().equals(UpgradeOrderDon.Status.noPayment) && !orderDon.getStatus().equals(UpgradeOrderDon.Status.close)) {
+		if (!orderDon.getStatus().equals(GoodsWholesaleUserDeposit.Status.noPayment)) {
 			log.info("押金支付宝已回调，重复修改状态 id:{}", orderDon.getId());
 			return;
 		}
@@ -332,6 +332,7 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 			payTime = DateUtil.parse(payTimeStr, "yyyy-MM-dd HH:mm:ss");
 		}
 		// 更改订单状态
+		orderDon.setStatus(GoodsWholesaleUserDeposit.Status.hasPayment);
 		orderDon.setTransactionId(transactionId);
 		orderDon.setPayTime(payTime);
 		orderDon.setShopId(appId);