fix 主订单状态

netflix-dao/src/main/java/com/cyksj/model/entity/OrderMasterDon.java

@@ -60,6 +60,11 @@ public class OrderMasterDon extends BaseEntity{
 	/** 支付状态 */
 	private Status status ;
 
+	/**
+	 * 购买种类数量
+	 */
+	private Integer num;
+
 	/**
 	 * 支付类型
 	 */

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

@@ -1006,6 +1006,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderMasterDon.setIsWebPay(unifiedOrderPayReq.getIsWebPay());
 		//默认支付宝支付
 		orderMasterDon.setType(OrderMasterDon.Type.ALI_PAY);
+		orderMasterDon.setNum(orderIds.size());
 		orderMasterDonService.save(orderMasterDon);
 
 		orderDonMapper.update(null, Wrappers.lambdaUpdate(OrderDon.class)
@@ -1502,6 +1503,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		masterDon.setTransactionId(transactionId);
 		masterDon.setPayTime(payTime);
 		masterDon.setShopId(appId);
+		masterDon.setStatus(OrderMasterDon.Status.hasPayment);
 		masterDon.setType(OrderMasterDon.Type.ALI_PAY);
 		orderMasterDonService.updateById(masterDon);
 

netflix-service/src/main/java/com/cyksj/service/paypal/PayPalService.java

@@ -78,6 +78,7 @@ public class PayPalService{
             masterDon.setTransactionId(transationId);
             masterDon.setPayTime(new Date());
             masterDon.setAbroadTransactionFee(new BigDecimal(transactionFee.getValue()).multiply(BigDecimal.valueOf(100)));
+            masterDon.setStatus(OrderMasterDon.Status.hasPayment);
             log.info("支付成功订单："+mOid+",支付交易号："+transationId);
             log.info("支付成功订单："+mOid+",返回参数："+Jsons.toJson(payment));
 

netflix-service/src/main/java/com/cyksj/service/stripe/StripeService.java

@@ -114,6 +114,7 @@ public class StripeService {
        masterDon.setTransactionId(chargeId);
        masterDon.setAbroadTransactionFee(BigDecimal.valueOf(balanceTransaction.getFee()));
        masterDon.setPayTime(new Date());
+       masterDon.setStatus(OrderMasterDon.Status.hasPayment);
        log.info("支付成功订单："+mOid+",支付交易号："+chargeId);
        log.info("支付成功订单："+mOid+",返回参数："+Jsons.toJson(session));