bugfix

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

@@ -6,10 +6,6 @@ import lombok.Data;
 public class CmSplitParams {
     private Integer shopOrderId;
     private Integer clubId;
-    /**
-     * 服务商id
-     */
-    private Integer providerId;
     /**
      * 供应商分帐号
      */

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

@@ -630,8 +630,10 @@ public class SplitAccountService extends BaseService {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String currentTime = format.format(calendar.getTime());
         List<OrderReceiptRelationPo> orderRelations = newOrderDao.getUndividedPaidReceipt(currentTime, shopOrderId);
-        if (null != params.getProviderId()) {
-            // 服务商
+        if (null != params.getShopSplitCode() && "E1808689662".equals(params.getShopSplitCode())) {
+            /**   服务商
+             *    当前版本薇旖美用厦门服务商作为供应商收款，订单收款商编为E1808689662判定为薇旖美订单
+             */
             params.setSplitType(1);
         } else {
             // 非服务商
@@ -680,7 +682,7 @@ public class SplitAccountService extends BaseService {
                 receiveCommission = 0.01;
             }
             // 收款手续费
-            totalReceiveCommission.set(MathUtil.add(receiveCommission,totalReceiveCommission.get()).doubleValue());
+            totalReceiveCommission.set(MathUtil.add(receiveCommission, totalReceiveCommission.get()).doubleValue());
         });
         /** todo 当前服务商模式默认 91%供应商，1%采美，8%服务商,后续应该后台加入分配比例，取值自动计算,或者使用商品编辑中的比例分账，在分账页手选服务商分帐号
          *  todo 当前形式仅支持单商品子订单，未考虑子订单多商品

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -34,7 +34,6 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -786,9 +785,9 @@ public class CmPayShopController extends BaseController {
     @RequestMapping("new/splitParams")
     @ResponseBody
     public CmSplitParams splitParams(String shopOrderId) {
-        CmSplitParams splitParams = splitAccountService.getSplitParams(shopOrderId);
-        return splitParams;
+        return splitAccountService.getSplitParams(shopOrderId);
     }
+
     @RequestMapping("new/splitEdit")
     @ResponseBody
     public Map<String, Object> splitEdit(String shopOrderId, String splits) {

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

@@ -2112,16 +2112,14 @@
         SELECT cso.shopOrderId,
                cso.splitCode AS shopSplitCode,
                cso.clubId,
-               sp.providerId,
-               cp.splitCode AS providerSplitCode,
+               sp.splitCode AS providerSplitCode,
                c.name AS clubName,
                sp.name AS spName,
-               cp.name AS cpName,
+               sp.name AS cpName,
                cso.needPayAmount
         FROM cm_shop_order cso
         LEFT JOIN club c ON cso.clubId = c.clubId
         LEFT JOIN serviceprovider sp ON c.spId = sp.serviceProviderId
-        LEFT JOIN cm_providers cp ON sp.providerId = cp.id
         WHERE cso.shopOrderId = #{shopOrderId}
     </select>