fix:merge

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

@@ -335,9 +335,10 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         OmsOrderDetail detail = detail(orderId);
 
         // 设置平台收入和分润
-
         setPromoterRecord(detail,PostStatusEnum.WAIT);
 
+        // 签协议
+        adminFeignService.contractRecord(new ContractDto(orderDetail.getPlatformType(),orderDetail.getMemberId()));
 
         return count;
     }
@@ -1054,8 +1055,6 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         }
         userOrderPaymentService.saveOrUpdate(orderPayment);
 
-        // 签协议
-        adminFeignService.contractRecord(new ContractDto(orderPayment.getPaymentClient(),detail.getMemberId()));
     }