关联口头佣金

src/main/java/com/caimei365/order/controller/ReceiptApi.java

@@ -352,7 +352,7 @@ public class ReceiptApi {
      *
      * @param receiptOperateDto {
      *                            verbalAmount: 口头返佣佣金
-     *                            shopOrderIds: 关联返佣子订单IDs
+     *                            shopOrderId: 关联返佣子订单ID
      *                            rebateRemarks:关联返佣备注
      *                            }
      */
@@ -362,8 +362,8 @@ public class ReceiptApi {
         if (null == receiptOperateDto.getVerbalAmount()) {
             return ResponseJson.error("口头返佣佣金参数异常", null);
         }
-        if (!StringUtils.hasLength(receiptOperateDto.getShopOrderIds())) {
-            return ResponseJson.error("关联返佣子订单IDs不能为空", null);
+        if (null == receiptOperateDto.getShopOrderId()) {
+            return ResponseJson.error("关联返佣子订单ID不能为空", null);
         }
         return receiptService.associateVerbalRebate(receiptOperateDto, headers);
     }

src/main/java/com/caimei365/order/service/ReceiptService.java

@@ -182,7 +182,7 @@ public interface ReceiptService {
      *
      * @param receiptOperateDto {
      *                            verbalAmount: 口头返佣佣金
-     *                            shopOrderIds: 关联返佣子订单IDs
+     *                            shopOrderId: 关联返佣子订单ID
      *                            rebateRemarks:关联返佣备注
      *                            }
      */

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -1256,7 +1256,7 @@ public class ReceiptServiceImpl implements ReceiptService {
      *
      * @param receiptOperateDto {
      *                          verbalAmount: 口头返佣佣金
-     *                          shopOrderIds: 关联返佣子订单IDs
+     *                          shopOrderId: 关联返佣子订单ID
      *                          rebateRemarks:关联返佣备注
      *                          }
      */
@@ -1268,11 +1268,8 @@ public class ReceiptServiceImpl implements ReceiptService {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作！", null);
         }
-        String[] shopOrderIdArr = receiptOperateDto.getShopOrderIds().split(",");
+        String[] shopOrderIdArr = receiptOperateDto.getShopOrderId().toString().split(",");
         List<Integer> shopIdList = receiptMapper.getShopIdList(shopOrderIdArr);
-        if (shopIdList.size() > 1) {
-            return ResponseJson.error("子订单不属于相同的供应商！", null);
-        }
         String date = DateUtils.getDate("yyyy-MM-dd HH:mm:ss");
         ReceiptPo receiptPo = new ReceiptPo();
         receiptPo.setPayWay(2);