下单机构Id

src/main/java/com/caimei365/order/mapper/SubmitMapper.java

@@ -68,6 +68,13 @@ public interface SubmitMapper {
      */
     String getClauseNameById(Integer clauseId);
 
+    /**
+     * 根据用户 Id 查询机构 Id
+     * @param userId
+     * @return
+     */
+    Integer getClubId(Integer userId);
+
     /**
      * 保存主订单数据
      */

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

@@ -1293,6 +1293,14 @@ public class SubmitServiceImpl implements SubmitService {
         }
         // 设置组织Id
         mainOrder.setOrganizeId(organizeId);
+        if (null == mainOrder.getUserId()) {
+            // 设置手动回滚事务
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return ResponseJson.error("用户Id为空！", null);
+        }
+        // 根据用户 Id 查询机构 Id
+        Integer clubId = submitMapper.getClubId(mainOrder.getUserId());
+        mainOrder.setClubId(clubId);
         /**
          * 保存主订单数据，返回订单Id
          */
@@ -1471,6 +1479,7 @@ public class SubmitServiceImpl implements SubmitService {
                 // 联合丽格
                 shopOrder.setRealPay(shopOrder.getNeedPayAmount());
             }
+            shopOrder.setClubId(clubId);
             // 设置运费
             /*boolean shopFlag = ( 1 == shopOrder.getShopPostFlag() && (null != mainOrder.getUserBeans() && 0 == mainOrder.getUserBeans()) ) || ( 0 == shopOrder.getShopPostFlag() && isColdChina.get() > 0.00d && 0 != organizeId ) || ( -1 == shopOrder.getShopPostFlag() && isColdChina.get() > 0.00d && 0 != organizeId );
             if (!shopFlag) {

src/main/resources/mapper/SubmitMapper.xml

@@ -268,6 +268,9 @@
         FROM bp_clause
         WHERE id = #{clauseId}
     </select>
+    <select id="getClubId" resultType="java.lang.Integer">
+        select clubId from club where userId = #{userId}
+    </select>
     <select id="getAddressDetailById" resultType="com.caimei365.order.model.vo.AddressVo">
         SELECT a.addressID  AS addressId,
                a.userID     AS userId,