服务商合并bugfix

src/main/java/com/caimei365/order/model/vo/SettlementVo.java

@@ -31,11 +31,6 @@ public class SettlementVo {
 
     @ExcelProperty(value = "机构名称", index = 2)
     private String clubName;
-    /**
-     * 协销名称
-     */
-    @ExcelIgnore
-    private String spName;
 
     @ExcelProperty(value = "服务商名称", index = 3)
     private String cpName;

src/main/resources/mapper/ShipMapper.xml

@@ -199,8 +199,7 @@
             so.orderTime,
             so.settlestatus,
             c.name AS clubName,
-            sp.name AS spName,
-            cp.name AS cpName,
+            sp.name AS cpName,
             IFNULL((SELECT settleAmount FROM cm_settle_record WHERE shopOrderId = so.shopOrderId AND settleType = 1),0) AS shopSettleAmount,
             IFNULL((SELECT settleAmount FROM cm_settle_record WHERE shopOrderId = so.shopOrderId AND settleType = 2),0) AS cmSettleAmount,
             IFNULL((SELECT settleAmount FROM cm_settle_record WHERE shopOrderId = so.shopOrderId AND settleType = 3),0) AS otherSettleAmount,
@@ -211,7 +210,6 @@
         FROM cm_shop_order so
         LEFT JOIN club c ON c.clubId = so.clubId
         LEFT JOIN serviceprovider sp ON c.spId = sp.serviceProviderID
-        LEFT JOIN cm_providers cp ON cp.id = sp.providerId
         <where>
             <if test="shopOrderNo != null and shopOrderNo != ''">
                 AND so.shopOrderNo = #{shopOrderNo}