分帐bugfix

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -358,4 +358,6 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
     public int updateDelCmOrderByOrderIDs(@Param("orderIDs") String[] orderIDs,@Param("delFlag") Integer delFlag);
 
     Double getPaidOrganizePrice(Integer orderProductId);
+
+    String findSplitCodeByOrganize(Integer organizeId);
 }

src/main/java/com/caimei/modules/order/entity/OrderProductVo.java

@@ -15,6 +15,8 @@ import java.math.BigDecimal;
 @Data
 public class OrderProductVo implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    private Integer organizeId;
     /**
      * 商品分账商户号
      */

src/main/java/com/caimei/modules/order/service/SplitAccountService.java

@@ -10,6 +10,7 @@ import com.caimei.redis.RedisService;
 import com.caimei.utils.MathUtil;
 import com.thinkgem.jeesite.common.service.BaseService;
 import okhttp3.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -75,6 +76,10 @@ public class SplitAccountService extends BaseService {
                     payParam.setPayWay("CREDIT");
                 }
                 List<SplitAccountPo> splitBillDetail = setSplitAccountDetail(shopOrder, payParam);
+                if (null == splitBillDetail || 0 == splitBillDetail.size()) {
+                    logger.info("分帐参数有误！！！！！！！！！！！！！");
+                    return;
+                }
                 HashMap<String, BigDecimal> sbm = new HashMap<>();
                 for (SplitAccountPo splitAccountPo : splitBillDetail) {
                     String subUserNo = splitAccountPo.getSubUserNo();
@@ -395,7 +400,11 @@ public class SplitAccountService extends BaseService {
                 splitAccount.setProductType(5);
                 // 该商品设置了商户号
                 splitAccount.setType(4);
-                splitAccount.setSubUserNo(shopOrder.getSplitCode());
+                String code = newOrderDao.findSplitCodeByOrganize(orderProduct.getOrganizeId());
+                if (StringUtils.isBlank(code)) {
+                    return null;
+                }
+                splitAccount.setSubUserNo(code);
                 logger.info("组织佣金分账参数------------->" + splitAccount.toString());
                 list.add(splitAccount);
             }

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1296,6 +1296,7 @@
                cop.isActProduct                                                   AS actProduct,
                cop.productType,
                p.productCategory                                                  AS productCategory,
+               cop.organizeId,
 #                当前版本采美豆抵运费未实装，且运费子订单已取消，运费金额并入子订单，取值不做操作
 #                IF(cop.shopid = 998 AND co.freight > 0, co.freight, cop.costPrice) AS costPrice,
                IFNULL(cop.costPrice,0)                                            AS costPrice,
@@ -2029,6 +2030,10 @@
         limit 0,1
     </select>
 
+    <select id="findSplitCodeByOrganize" resultType="java.lang.String">
+        select splitCode from cm_mall_organize where id = #{organizeId}
+    </select>
+
     <insert id="addCmOrder" parameterType="com.caimei.modules.order.entity.NewOrder" useGeneratedKeys="true" keyProperty="orderID">
         insert into cm_order
         <trim prefix="(" suffix=")" suffixOverrides=",">

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -2126,7 +2126,6 @@
                ifnull(cs.shopPercent, 0) as shopPercent,
                ifnull(cs.organizePercent, 0) as organizePercent,
                ifnull(cs.cmPercent, 0) as cmPercent,
-               ifnull(cs.costCheckFlag, 0)    as costType,
                chs.price
         from cm_sku cs
                  left join cm_hehe_sku chs on cs.skuId = chs.skuId

src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp

@@ -405,7 +405,7 @@
                     </th>
                     <th>子订单编号(ID)</th>
                     <th colspan="3">订单编号(ID)</th>
-                    <th colspan="2">订单金额</th>
+                    <th colspan="2">子订单金额</th>
                     <th colspan="3">下单时间</th>
                     <th>收款状态</th>
                     <th>收款金额</th>