bugfix

src/main/java/com/caimei/modules/hehe/service/CmHeheCollageService.java

@@ -69,7 +69,7 @@ public class CmHeheCollageService extends CrudService<CmHeheCollageDao, CmHeheCo
 		// 已支付订单手机号
 		List<String> mobileList = cmHeheCollageDao.getMobilesByCollageId(collageId);
 		// 拼团成功短信推送
-		mobileList.forEach(mobile-> SMSUtils.sendSms(mobile, "您的商品已拼团成功，请赶紧登录呵呵商城小程序查看订单吧。"));
+		mobileList.forEach(mobile-> SMSUtils.sendSms(mobile, "您的商品已拼团成功，请赶紧登录颜选美学小程序查看订单吧。"));
 		// 关闭其它未支付拼团订单
 		List<Integer> orderIdList = cmHeheCollageDao.findNoPayCollageOrderIds(collageId);
 		orderIdList.forEach(noPayOrderId->{

src/main/resources/mappings/modules/hehe/CmHeheProductMapper.xml

@@ -151,6 +151,7 @@
 		FROM product a
 		LEFT JOIN shop s on s.shopID = a.shopID
 		<where>
+			a.splitCode is not null and a.splitCode != ''
 			<if test="productID != null" >
 				AND a.productID = #{productID}
 			</if>

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

@@ -990,6 +990,7 @@
           AND cdr.payWay = 1
           AND cdr.receiptDate <![CDATA[  <=  ]]> #{currentTime}
           AND co.organizeID = 0
+          AND co.orderType != 2
           AND co.refundType != 2
     </select>
 

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

@@ -1122,7 +1122,6 @@
                  LEFT JOIN shop s ON s.shopID = a.shopID
                  LEFT JOIN club c ON c.userID = a.userID
         WHERE co.organizeID = 0
-          AND co.orderType != 2
           AND co.refundType != 2
           AND co.delFlag = 0
           AND a.delFlag = 0