联合丽格V1.0.2

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

@@ -48,6 +48,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * 退货退款Service
@@ -615,7 +616,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 cmUserBalanceRecordService.insertUserBalanceRecord(cmUserBalanceRecord);
             }
             //修改子订单信息
-            updateShopOrderAmount(newOrder.getOrderID());
+            updateShopOrderAmount(newOrder.getOrderID(),newOrder.getShopOrderID());
 
             //判断是否有线上退款
             if ("1".equals(returnedPurchase.getReturnedWay()) && returnedPurchase.getRefundOnlineFee() > 0) {
@@ -767,9 +768,15 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
         }
     }
 
-    public void updateShopOrderAmount(Integer orderId) {
+    public void updateShopOrderAmount(Integer orderId,Integer shopOrderId) {
         //修改子订单付供应商金额
         List<NewShopOrder> shopOrders = newShopOrderDao.findListByOrderID(orderId);
+        //过滤子订单
+        if(shopOrderId!=null){
+            List<NewShopOrder>  newShopOrder= shopOrders.stream()
+                    .filter(s -> s.getShopOrderID().equals(shopOrderId)).collect(Collectors.toList());
+            shopOrders=newShopOrder;
+        }
         shopOrders.removeIf(s -> 998 == s.getShopID());
         for (NewShopOrder shopOrder : shopOrders) {
             List<NewOrderProduct> orderProducts = newOrderProductDao.findByShopOrderID(shopOrder.getShopOrderID());
@@ -1140,12 +1147,50 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             cmReturnedPurchase.setReviewUserID(null);
             cmReturnedPurchase.setReviewRemarks(null);
             cmReturnedPurchaseDao.updateRevokeApply(cmReturnedPurchase);
+
             NewOrder newOrder = newOrderService.get(cmReturnedPurchase.getOrderID().toString());
+            //子订单撤销退款
+            NewShopOrder newShopOrder = newShopOrderService.get(cmReturnedPurchase.getShopOrderID().toString());
             //2.查询除本次撤销记录外存在的其他的有效记录
             CmReturnedPurchase item = new CmReturnedPurchase();
             item.setStatus("2");
-            item.setOrderID(cmReturnedPurchase.getOrderID());
+//            item.setOrderID(cmReturnedPurchase.getOrderID());
+            item.setShopOrderID(cmReturnedPurchase.getShopOrderID());
             List<CmReturnedPurchase> returnedPurchaseRecord = cmReturnedPurchaseDao.findReturnedPurchaseRecord(item);
+            if (CollectionUtils.isNotEmpty(returnedPurchaseRecord)) {
+                //存在退款记录则本次撤销后订单状态为部分退款
+                //部分退货
+                newOrder.setRefundType("1");
+                String status = newShopOrder.getStatus().toString();
+                if (StringUtils.equals("5", status)) {//如果之前为交易全退，撤销后则变为
+                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
+                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.DAISHOU_BUFA.getCode()));//待收部发
+                    }
+                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
+                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.BUSHOU_BUFA.getCode()));//部收部发
+                    }
+                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
+                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.YISHOU_BUFA.getCode()));//已收部发
+                    }
+                }
+            } else {
+                //不存在退款记录则本次退款为未退款
+                String status = newShopOrder.getStatus().toString();
+                newOrder.setRefundType("");
+                if (StringUtils.equals("5", status)) {//如果之前为交易全退，撤销后则变为
+                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
+                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.DAISHOU_DAIFA.getCode()));//待收待发
+                    }
+                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
+                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.BUSHOU_DAIFA.getCode()));//部收待发
+                    }
+                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
+                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.YISHOU_DAIFA.getCode()));//已收待发
+                    }
+                }
+            }
+            newShopOrder.setRefundStatus(1);//无退款
+            //主订单
             if (CollectionUtils.isNotEmpty(returnedPurchaseRecord)) {
                 //存在退款记录则本次撤销后订单状态为部分退款
                 //部分退货
@@ -1180,9 +1225,9 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             }
             //更新订单信息
             newOrderService.update(newOrder);
-
+            newShopOrderDao.update(newShopOrder);
             //更新用户余额总金额
-            Integer userID = newOrder.getUserID();
+            Integer userID = newShopOrder.getUserID();
             CmUser cmUser = cmUserDao.get(String.valueOf(userID));
             Double refundBalanceFee = cmReturnedPurchase.getRefundBalanceFee();
             cmUser.setUserID(userID);
@@ -1203,8 +1248,9 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             if (refundBalanceFee > 0) {//存在余额退款
                 //撤销余额收支记录
                 CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
-                cmUserBalanceRecord.setUserId(newOrder.getUserID());
-                cmUserBalanceRecord.setOrderId(newOrder.getOrderID());
+                cmUserBalanceRecord.setUserId(newShopOrder.getUserID());
+//                cmUserBalanceRecord.setOrderId(newOrder.getOrderID());
+                cmUserBalanceRecord.setOrderId(newShopOrder.getShopOrderID());
                 cmUserBalanceRecord.setReturnedId(Integer.parseInt(cmReturnedPurchase.getId()));
                 cmUserBalanceRecord.setRemark("撤销退款，余额记录无效-后台");
                 cmUserBalanceRecord.setDelFlag("1");
@@ -1216,8 +1262,9 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             if (num != null && num > 0) {
                 userBeans = userBeans + num;
             }
-            if (newOrder.getUserBeans() != null && newOrder.getUserBeans() > 0) {
-                userBeans = userBeans - newOrder.getUserBeans();
+//            if (newOrder.getUserBeans() != null && newOrder.getUserBeans() > 0) {
+            if (cmUser != null && newShopOrder.getUseBeanAmount() !=null) {
+                userBeans = userBeans -  newShopOrder.getUseBeanAmount();
             }
             cmUserbeanshistoryDao.updateBeansHistoryByReturned(newOrder.getOrderID());
             cmUserDao.updateUserBeans(newOrder.getUserID(), userBeans);
@@ -1226,7 +1273,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 cmCouponClubDao.deleteByReturnedId(Integer.parseInt(cmReturnedPurchase.getId()));
             }
             //修改子订单信息
-            updateShopOrderAmount(newOrder.getOrderID());
+            updateShopOrderAmount(cmReturnedPurchase.getOrderID(),cmReturnedPurchase.getShopOrderID());
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -1572,10 +1572,18 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     }
 
     @Transactional(readOnly = false)
-    public void confirmOrder(Integer orderID) {
-        NewOrder order = newOrderDao.findByOrderID(orderID);
+    public void confirmOrder(Integer orderID, Integer shopOrderID) {
+        NewOrder order = get(orderID.toString());
         order.setConfirmFlag("1");//确认订单标识 后台确认 1
-        order.setStatus("11");//订单状态变成 ==> 待收款待付款 11
+        if (order.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getStatus().equals(0)).collect(Collectors.toList()).size()==1) {
+            order.setStatus("11");//订单状态变成 ==> 待收款待付款 11
+        }
+        //过滤子订单
+        List<NewShopOrder> newShopOrders = order.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderID().equals(shopOrderID)).collect(Collectors.toList());
+        order.setNewShopOrders(newShopOrders);
+
+        order.getNewShopOrders().get(0).setStatus(11);//订单状态变成 ==> 待收款待付款 11
+
 
         //修改订单状态（余额抵扣）
         if (order.getPayableAmount() != null) {
@@ -1587,15 +1595,35 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 order.setReceiptStatus("2");
             }
         }
+
+        //        order.getBalancePayFee()
+        Double balancePayFee = order.getNewShopOrders().get(0).getAccountAmount();
+        //修改子订单状态（余额抵扣）
+        if (order.getNewShopOrders().get(0).getRealPay() != null) {
+            if ( balancePayFee != null && balancePayFee ==order.getNewShopOrders().get(0).getRealPay()) {
+                order.getNewShopOrders().get(0).setStatus(Integer.valueOf(NewOrderStatus.YISHOU_DAIFA.getCode()));
+                order.getNewShopOrders().get(0).setReceiptStatus("3");
+            } else if ( balancePayFee != null && balancePayFee <order.getNewShopOrders().get(0).getRealPay()) {
+                order.getNewShopOrders().get(0).setStatus(Integer.valueOf(NewOrderStatus.BUSHOU_DAIFA.getCode()));
+                order.getNewShopOrders().get(0).setReceiptStatus("2");
+          }
+        }
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String curDateStr = sdf.format(date);
         order.setConfirmTime(curDateStr);
-        if (order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
-            saveDiscernReceipt(order.getBalancePayFee(), orderID);
+
+//        if (order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
+        if (balancePayFee != null && balancePayFee > 0) {
+            //已付金额
+            double v = balancePayFee + order.getNewShopOrders().get(0).getReceiptAmount();
+            order.getNewShopOrders().get(0).setReceiptAmount(v);
+            saveDiscernReceipt(balancePayFee, orderID);
             //针对商品productId:6898,做兑换券操作(couponId:15)
-            if ("3".equals(order.getReceiptStatus())) {
-                List<NewOrderProduct> orderProducts = newOrderProductDao.findListByOrderID(orderID);
+//            if ("3".equals(order.getReceiptStatus())) {
+            if ("3".equals(order.getNewShopOrders().get(0).getReceiptStatus())) {
+//                List<NewOrderProduct> orderProducts = newOrderProductDao.findListByOrderID(orderID);
+                List<NewOrderProduct> orderProducts = newShopOrders.get(0).getNewOrderProducts();
                 for (NewOrderProduct orderProduct : orderProducts) {
                     if (orderProduct.getProductID().equals(6898)) {
                         Integer num = orderProduct.getNum();
@@ -1619,6 +1647,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             }
         }
         newOrderDao.update(order);
+        newShopOrderDao.update(order.getNewShopOrders().get(0));
     }
 
     /**

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

@@ -306,7 +306,7 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             if ("1".equals(newOrder.getFreePostFlag())) {
                 so.setFreight(newOrder.getFreight());
             } else {
-                so.setFreight(Double.valueOf(newOrder.getFreePostFlag()));
+                so.setFreight(Double.valueOf(newOrder.getFreePostFlag()!=null ?newOrder.getFreePostFlag():"-2"));
             }
             //订单采美豆
             so.setUserBeans(newOrder.getUserBeans());

src/main/java/com/caimei/modules/product/dao/CmOrganizeProductInfoMapper.java

@@ -71,4 +71,11 @@ public interface CmOrganizeProductInfoMapper extends CrudDao<CmOrganizeProductIn
      * @return 结果
      */
     public int delNotCmOrganizeProductInfoByOrganizeIds(@Param("organizeIds") Integer[] organizeIds,  @Param("productId")Integer productId);
+    /**
+     * 批量修改商品组织信息（采购平台独立字段）
+     *
+     * @param organizeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int updateNotCmOrganizeProductInfos(@Param("organizeIds") Integer[] organizeIds,  @Param("productId")Integer productId,@Param("validFlag")Integer validFlag);
 }

src/main/java/com/caimei/modules/product/service/ProductNewService.java

@@ -102,7 +102,7 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
             // 上架平台
             List<String> organizeNames = new ArrayList<>();
             if (p.getGroundMall().contains("0")) {
-                organizeName = "【采美】平台";
+                organizeName = "【采美集采联盟】平台";
                 organizeNames.add(organizeName);
             }
             if (p.getGroundMall().contains("4")) {

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -333,7 +333,7 @@ public class ProductService extends CrudService<ProductDao, Product> {
             listMall.sort(Comparator.naturalOrder());
             String strip = StringUtils.strip(listMall.toString(), "[]");
             product.setGroundMall(strip.replaceAll(",", "##").trim());
-            cmOrganizeProductInfoMapper.delNotCmOrganizeProductInfoByOrganizeIds(listMall.toArray(new Integer[listMall.size()]),product.getProductID());
+            cmOrganizeProductInfoMapper.updateNotCmOrganizeProductInfos(listMall.toArray(new Integer[listMall.size()]),product.getProductID(),3);
             listMall.forEach(s -> {
                 CmOrganizeProductInfo cmOrganizeProductInfoOrganizeId = new CmOrganizeProductInfo();
                 cmOrganizeProductInfoOrganizeId.setOrganizeId(s);
@@ -394,7 +394,7 @@ public class ProductService extends CrudService<ProductDao, Product> {
             productDao.updateMainImage(product);
         } else {
             productDao.updateByPrimaryKeySelective(product);
-            if (StringUtils.isNotBlank(product.getValidFlag())) {
+            if (listMall.contains(0)&&StringUtils.isNotBlank(product.getValidFlag())) {
                 CmOrganizeProductInfo cmOrganizeProductInfo = new CmOrganizeProductInfo();
                 cmOrganizeProductInfo.setOrganizeId(0);
                 cmOrganizeProductInfo.setProductId(product.getProductID());

src/main/resources/mappings/modules/cmpage/CmPageCentreMapper.xml

@@ -203,10 +203,10 @@
 		  left join cm_hehe_product chp on a.productId = chp.productId
 		WHERE
 		  a.centreId = #{centreId}
-		and p.groundMall like CONCAT('%', copi.organizeId, '%')
           <if test="type != null and type == '8'">
               and chp.id is not null
           </if>
+		group by p.productID
 	</select>
 
 	<select id="findPageTitle" resultType="java.lang.String">

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

@@ -86,126 +86,124 @@
 
 
     <select id="findList" resultType="CmDiscernReceipt">
-<!--        (SELECT-->
-<!--        <include refid="cmDiscernReceiptColumns"/>,-->
-<!--        cso.orderId AS orderID,-->
-<!--        cso.shopOrderNo as shopOrderNo,-->
-<!--        cso.shopOrderId as shopOrderId,-->
-<!--        cof.bankAccount AS bankNameType,-->
-<!--        s.checkMan,-->
-<!--        s.name AS shopName,-->
-<!--        u.userName AS "userName",-->
-<!--        u.name AS "name",-->
-<!--        IF(crr.relationType = '6',(SELECT NAME FROM USER mu WHERE mu.userId=ccb.userId),'') AS "backname",-->
-<!--        cr.organizeID AS organizeID-->
-<!--        FROM cm_discern_receipt a-->
-
-<!--        LEFT JOIN cm_receipt_order_relation crr ON crr.receiptId = a.id AND crr.delFlag = '0'-->
-<!--        LEFT JOIN cm_coupon_buyrecord ccb ON crr.couponRecordId=ccb.id-->
-<!--&#45;&#45;         LEFT JOIN cm_order cr ON cr.orderId = crr.orderId-->
-<!--&#45;&#45;         LEFT JOIN cm_shop_order cso ON cso.orderId = cr.orderId-->
-<!--        LEFT JOIN cm_shop_order cso ON cso.shopOrderId = crr.shopOrderId or cso.orderId = crr.orderId-->
-<!--        LEFT JOIN cm_order cr ON cr.orderId = cso.orderId-->
-<!--        LEFT JOIN shop s ON s.shopID = cso.shopID-->
-<!--        left join user u on u.userID = cr.userID-->
-<!--        LEFT JOIN club c ON cr.userId = c.userId-->
-<!--        LEFT JOIN cm_offline_collection cof ON a.payType = cof.type-->
-<!--        <where>-->
-<!--            crr.relationType != 1-->
-<!--            <if test="id != null and id != '' and id != 0 ">-->
-<!--                AND a.id = #{id}-->
-<!--            </if>-->
-<!--            <if test="organizeID != null and organizeID != 9999 ">-->
-<!--                AND cr.organizeID = #{organizeID}-->
-<!--            </if>-->
-<!--            <if test="organizeID == 9999 ">-->
-<!--                AND cr.orderType = 2-->
-<!--            </if>-->
-<!--            <if test="startTime != null and startTime != ''">-->
-<!--                AND (a.receiptDate &gt; #{startTime} OR a.receiptDate = #{startTime})-->
-<!--            </if>-->
-<!--            <if test="endTime != null and endTime != ''">-->
-<!--                AND (a.receiptDate &lt; #{endTime} OR a.receiptDate = #{endTime})-->
-<!--            </if>-->
-<!--            <if test="payWay != null and payWay != ''">-->
-<!--                AND a.payWay = #{payWay}-->
-<!--            </if>-->
-<!--            <if test="payType != null and payType != ''">-->
-<!--                AND a.payType = #{payType}-->
-<!--            </if>-->
-<!--            <if test="receiptType != null and receiptType != ''">-->
-<!--                <if test="receiptType==2 and newReceiptType==3">-->
-<!--                    and (a.receiptType = 9)-->
-<!--                    or a.receiptType = #{receiptType}-->
-<!--                </if>-->
-<!--                <if test="receiptType!=2">-->
-<!--                    AND a.receiptType = #{receiptType}-->
-<!--                </if>-->
-<!--                AND a.receiptType = #{receiptType}-->
-<!--            </if>-->
-<!--            <if test="newReceiptType !=null">-->
-<!--                <if test="newReceiptType==3">-->
-<!--                    and a.newReceiptType =3-->
-<!--                </if>-->
-<!--                <if test="newReceiptType != 3">-->
-<!--                    and a.newReceiptType=#{newReceiptType}-->
-<!--                </if>-->
-<!--            </if>-->
-
-<!--            <if test="receiptStatus != null and receiptStatus != ''">-->
-<!--                AND a.receiptStatus = #{receiptStatus}-->
-<!--            </if>-->
-<!--            <if test="orderNo != null and orderNo != ''">-->
-<!--                AND ((cr.orderNo like concat('%',#{orderNo},'%')) OR (cso.shopOrderNo like concat('%',#{orderNo},'%')))-->
-<!--            </if>-->
-<!--            <if test="orderID != null and orderID != ''">-->
-<!--                AND (cr.orderID = #{orderID} )-->
-<!--            </if>-->
-<!--            <if test="shopOrderId != null and shopOrderId != ''">-->
-<!--                AND (cso.shopOrderId = #{shopOrderId} )-->
-<!--            </if>-->
-<!--            <if test="userName != null and userName != ''">-->
-<!--                AND (u.userName LIKE concat('%',#{userName},'%') or u.name LIKE concat('%',#{userName},'%'))-->
-<!--            </if>-->
-<!--            <if test="receiptProgress != null and receiptProgress != ''">-->
-<!--                and (case when crr.relationType = '1' then-->
-<!--                cso_cr.receiptStatus-->
-<!--                else-->
-<!--                cr.receiptStatus-->
-<!--                end) = #{receiptProgress}-->
-<!--            </if>-->
-<!--            <if test="receiptOrderType != null and receiptOrderType != ''">-->
-<!--                and (case when crr.relationType = '1' then-->
-<!--                cso.orderType-->
-<!--                else-->
-<!--                cr.orderType-->
-<!--                end) = #{receiptOrderType}-->
-<!--            </if>-->
-<!--            <if test="associationNum != null and associationNum != ''">-->
-<!--                <if test="associationNum == 1">-->
-<!--                    and (select count(1) from cm_receipt_order_relation where receiptID = a.id and delFlag = '0') = 1-->
-<!--                </if>-->
-<!--                <if test="associationNum == 2">-->
-<!--                    and (select count(1) from cm_receipt_order_relation where receiptID = a.id and delFlag = '0')-->
-<!--                    <![CDATA[ > ]]> 1-->
-<!--                </if>-->
-<!--            </if>-->
-<!--            <if test="paYee !=null and paYee != ''">-->
-<!--                <if test="paYee == '采美'">-->
-<!--                    and a.payWay = 3-->
-<!--                    OR a.payWay = 2-->
-<!--                    AND a.newReceiptType != 3 AND a.payWay = 2-->
-<!--                </if>-->
-<!--                <if test="payWay==1">-->
-<!--                    and s.name=#{paYee}-->
-<!--                </if>-->
+        SELECT * from ((SELECT
+        <include refid="cmDiscernReceiptColumns"/>,
+        cso.orderId AS orderID,
+        cso.shopOrderNo as shopOrderNo,
+        cso.shopOrderId as shopOrderId,
+        cof.bankAccount AS bankNameType,
+        s.checkMan,
+        s.name AS shopName,
+        u.userName AS "userName",
+        u.name AS "name",
+        IF(crr.relationType = '6',(SELECT NAME FROM USER mu WHERE mu.userId=ccb.userId),'') AS "backname",
+        cr.organizeID AS organizeID
+        FROM cm_discern_receipt a
+        LEFT JOIN cm_receipt_order_relation crr ON crr.receiptId = a.id AND crr.delFlag = '0'
+        LEFT JOIN cm_coupon_buyrecord ccb ON crr.couponRecordId=ccb.id
+        LEFT JOIN cm_shop_order cso ON cso.shopOrderId = crr.shopOrderId
+        LEFT JOIN cm_order cr ON cr.orderId = cso.orderId
+        LEFT JOIN shop s ON s.shopID = cso.shopID
+        left join user u on u.userID = cr.userID
+        LEFT JOIN club c ON cr.userId = c.userId
+        LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
+        <where>
+            crr.relationType = 1
+            <if test="id != null and id != '' and id != 0 ">
+                AND a.id = #{id}
+            </if>
+            <if test="organizeID != null and organizeID != 9999 ">
+                AND cr.organizeID = #{organizeID}
+            </if>
+            <if test="organizeID == 9999 ">
+                AND cr.orderType = 2
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND (a.receiptDate &gt; #{startTime} OR a.receiptDate = #{startTime})
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND (a.receiptDate &lt; #{endTime} OR a.receiptDate = #{endTime})
+            </if>
+            <if test="payWay != null and payWay != ''">
+                AND a.payWay = #{payWay}
+            </if>
+            <if test="payType != null and payType != ''">
+                AND a.payType = #{payType}
+            </if>
+            <if test="receiptType != null and receiptType != ''">
+                <if test="receiptType==2 and newReceiptType==3">
+                    and (a.receiptType = 9)
+                    or a.receiptType = #{receiptType}
+                </if>
+                <if test="receiptType!=2">
+                    AND a.receiptType = #{receiptType}
+                </if>
+                AND a.receiptType = #{receiptType}
+            </if>
+            <if test="newReceiptType !=null">
+                <if test="newReceiptType==3">
+                    and a.newReceiptType =3
+                </if>
+                <if test="newReceiptType != 3">
+                    and a.newReceiptType=#{newReceiptType}
+                </if>
+            </if>
 
-<!--            </if>-->
-<!--            and a.delFlag = '0'-->
-<!--        </where>  group by a.id order by a.id desc -->
-<!--      )-->
-<!--        union-->
+            <if test="receiptStatus != null and receiptStatus != ''">
+                AND a.receiptStatus = #{receiptStatus}
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND ((cr.orderNo like concat('%',#{orderNo},'%')) OR (cso.shopOrderNo like concat('%',#{orderNo},'%')))
+            </if>
+            <if test="orderID != null and orderID != ''">
+                AND (cr.orderID = #{orderID} )
+            </if>
+            <if test="shopOrderId != null and shopOrderId != ''">
+                AND (cso.shopOrderId = #{shopOrderId} )
+            </if>
+            <if test="userName != null and userName != ''">
+                AND (u.userName LIKE concat('%',#{userName},'%') or u.name LIKE concat('%',#{userName},'%'))
+            </if>
+            <if test="receiptProgress != null and receiptProgress != ''">
+                and (case when crr.relationType = '1' then
+                cso_cr.receiptStatus
+                else
+                cr.receiptStatus
+                end) = #{receiptProgress}
+            </if>
+            <if test="receiptOrderType != null and receiptOrderType != ''">
+                and (case when crr.relationType = '1' then
+                cso.orderType
+                else
+                cr.orderType
+                end) = #{receiptOrderType}
+            </if>
+            <if test="associationNum != null and associationNum != ''">
+                <if test="associationNum == 1">
+                    and (select count(1) from cm_receipt_order_relation where receiptID = a.id and delFlag = '0') = 1
+                </if>
+                <if test="associationNum == 2">
+                    and (select count(1) from cm_receipt_order_relation where receiptID = a.id and delFlag = '0')
+                    <![CDATA[ > ]]> 1
+                </if>
+            </if>
+            <if test="paYee !=null and paYee != ''">
+                <if test="paYee == '采美'">
+                    and a.payWay = 3
+                    OR a.payWay = 2
+                    AND a.newReceiptType != 3 AND a.payWay = 2
+                </if>
+                <if test="payWay==1">
+                    and s.name=#{paYee}
+                </if>
 
+            </if>
+            and a.delFlag = '0'
+        </where>
+        group by a.id
+      )
+        union
+        (
         SELECT
         <include refid="cmDiscernReceiptColumns"/>,
         cso.orderId AS orderID,
@@ -219,20 +217,16 @@
         IF(crr.relationType = '6',(SELECT NAME FROM USER mu WHERE mu.userId=ccb.userId),'') AS "backname",
         cr.organizeID AS organizeID
         FROM cm_discern_receipt a
-
         LEFT JOIN cm_receipt_order_relation crr ON crr.receiptId = a.id AND crr.delFlag = '0'
         LEFT JOIN cm_coupon_buyrecord ccb ON crr.couponRecordId=ccb.id
---         LEFT JOIN cm_order cr ON cr.orderId = crr.orderId
---         LEFT JOIN cm_shop_order cso ON cso.shopOrderId = cr.orderId
-        LEFT JOIN cm_shop_order cso ON cso.shopOrderId = crr.shopOrderId or cso.orderId = crr.orderId
+        LEFT JOIN cm_shop_order cso ON  cso.orderId = crr.orderId
         LEFT JOIN cm_order cr ON cr.orderId = cso.orderId
         LEFT JOIN shop s ON s.shopID = cso.shopID
         left join user u on u.userID = cr.userID
         LEFT JOIN club c ON cr.userId = c.userId
         LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
         <where>
---             crr.relationType = 1
-             a.delFlag = '0'
+            crr.relationType != 1
             <if test="id != null and id != '' and id != 0 ">
                 AND a.id = #{id}
             </if>
@@ -322,10 +316,10 @@
                 </if>
 
             </if>
-
+            and a.delFlag = '0'
         </where>
-        group by a.id order by a.id desc
-
+         group by a.id
+     )) as a order by a.id desc
     </select>
 
     <select id="findAllList" resultType="CmDiscernReceipt">
@@ -981,7 +975,7 @@
         select sum(associateAmount) from cm_receipt_order_relation cror
                                              left join cm_discern_receipt cdr on cror.receiptID = cdr.id
         where cror.shopOrderID = #{shopOrderID} and cror.delFlag = '0' and cror.relationType = '2'
-          and cdr.delFlag = '0' and cdr.receiptStatus = '3' and cdr.payWay != '3'
+          and cdr.delFlag = '0' and cdr.receiptStatus = '3' and cdr.payWay = '2'
 	</select>
 
     <select id="gathering" resultType="com.caimei.modules.order.entity.CmMainReceiptExport">

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

@@ -68,6 +68,9 @@
             <if test="id != null and id != ''">
                 AND a.id != #{id}
             </if>
+            <if test="shopOrderID != null and shopOrderID != ''">
+                AND a.shopOrderId = #{shopOrderID}
+            </if>
             <if test="orderID != null and orderID != ''">
                 AND a.orderID = #{orderID}
             </if>

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

@@ -33,6 +33,7 @@
             ifnull(a.receiptAmount,0) AS receiptAmount,
             (ifnull(a.realPay,0) - ifnull(a.receiptAmount,0)) as restAmount,
             a.receiptStatus as shopReceiptStatus,
+            a.receiptStatus as ReceiptStatus,
 			a.canRefundAmount AS  canRefundAmount,
 			a.refundAmount AS  refundAmount,
 			a.clubID  AS clubID,
@@ -280,6 +281,9 @@
             <if test="shopOrderNo != null and shopOrderNo != ''">
                 shopOrderNo = #{shopOrderNo},
             </if>
+            <if test="status != null and status != ''">
+                shopStatus = #{status},
+            </if>
             <if test="shopOrderNo != null and shopOrderNo != ''">
                 orderID = #{orderID},
             </if>
@@ -528,6 +532,9 @@
     <update id="updateByShopOrderID" parameterType="newShopOrder">
         update cm_shop_order
         <set>
+            <if test="status != null and status != ''">
+                shopStatus = #{status},
+            </if>
             <if test="shopOrderNo != null and shopOrderNo != ''">
                 shopOrderNo = #{shopOrderNo},
             </if>
@@ -824,6 +831,9 @@
             <if test="payedShopAmount != null">
                 payedShopAmount = #{payedShopAmount}
             </if>
+            <if test="status != null and status != ''">
+                shopStatus = #{status},
+            </if>
         </set>
         WHERE shopOrderID = #{shopOrderID}
     </select>

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

@@ -18,22 +18,27 @@
         <include refid="selectCmOrganizeProductInfoVo"/>
         from cm_organize_product_info AS cm_organize_product_info
         <where>
-            <if test="organizeId != null "> and cm_organize_product_info.organizeId = #{organizeId}</if>
-            <if test="productId != null "> and cm_organize_product_info.productId = #{productId}</if>
-            <if test="validFlag != null "> and cm_organize_product_info.validFlag = #{validFlag}</if>
+            <if test="organizeId != null ">and cm_organize_product_info.organizeId = #{organizeId}</if>
+            <if test="productId != null ">and cm_organize_product_info.productId = #{productId}</if>
+            <if test="validFlag != null ">and cm_organize_product_info.validFlag = #{validFlag}</if>
         </where>
         order BY cm_organize_product_info.organizeId asc
         limit 0,1
     </select>
 
-    <select id="getCmOrganizeProductInfoList" parameterType="com.caimei.modules.product.entity.CmOrganizeProductInfo" resultMap="CmOrganizeProductInfoResult">
+    <select id="getCmOrganizeProductInfoList" parameterType="com.caimei.modules.product.entity.CmOrganizeProductInfo"
+            resultMap="CmOrganizeProductInfoResult">
         <include refid="selectCmOrganizeProductInfoVo"/>
         from cm_organize_product_info AS cm_organize_product_info
-        <where>
-            <if test="organizeId != null "> and cm_organize_product_info.organizeId = #{organizeId}</if>
-            <if test="productId != null "> and cm_organize_product_info.productId = #{productId}</if>
-            <if test="validFlag != null "> and cm_organize_product_info.validFlag = #{validFlag}</if>
+        LEFT JOIN product p ON cm_organize_product_info.productId = p.productId and p.groundMall like CONCAT('%',
+        cm_organize_product_info.organizeId, '%')
+        <where>1=1
+            <if test="organizeId != null ">and cm_organize_product_info.organizeId = #{organizeId}</if>
+            <if test="productId != null ">and cm_organize_product_info.productId = #{productId}</if>
+            <if test="validFlag != null ">and cm_organize_product_info.validFlag = #{validFlag}</if>
+            and p.productId is not null
         </where>
+        group by cm_organize_product_info.organizeId
     </select>
 
 
@@ -73,10 +78,21 @@
         </foreach>
     </delete>
     <delete id="delNotCmOrganizeProductInfoByOrganizeIds" parameterType="String">
-        delete from cm_organize_product_info where  productId = #{productId} and  organizeId not in
+        delete from cm_organize_product_info where productId = #{productId} and organizeId not in
         <foreach item="organizeId" collection="organizeIds" open="(" separator="," close=")">
             #{organizeId}
         </foreach>
     </delete>
+    <update id="updateNotCmOrganizeProductInfos"
+            parameterType="com.caimei.modules.product.entity.CmOrganizeProductInfo">
+        update cm_organize_product_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="validFlag != null">validFlag = #{validFlag},</if>
+        </trim>
+        where productId = #{productId} and organizeId not in
+        <foreach item="organizeId" collection="organizeIds" open="(" separator="," close=")">
+            #{organizeId}
+        </foreach>
+    </update>
 
 </mapper>

src/main/resources/mappings/modules/user/CmUserBalanceRecordMapper.xml

@@ -110,7 +110,13 @@
 		UPDATE cm_user_balance_record SET
 		remark = #{remark},
 		delFlag = #{delFlag}
-		WHERE userId = #{userId} AND orderId = #{orderId} and returnedId = #{returnedId}
+		WHERE userId = #{userId} and returnedId = #{returnedId}
+		<if test="orderId != null and orderId != ''">
+			AND orderId = #{orderId}
+		</if>
+		<if test="shopOrderId != null and shopOrderId != ''">
+			AND shopOrderId= #{shopOrderId}
+		</if>
 	</update>
 
 	<!--收款撤销-->
@@ -191,7 +197,7 @@
 	<update id="updateByWithdrawalsId">
 		UPDATE cm_user_balance_record SET delFlag = 1 WHERE withdrawalsId = #{withdrawalsId}
 	</update>
-	
+
 	<select id="findBalanceWithdrawals" resultType="integer">
 		SELECT id FROM cm_user_balance_withdrawals WHERE status = 0 AND userID = #{userId} AND delFlag = 0 LIMIT 1
 	</select>

src/main/resources/mappings/modules/weisha/CmOrganizeProductMapper.xml

@@ -263,7 +263,6 @@
                  left join cm_organize_product_info copi on copi.productId = p.productID
                  LEFT JOIN shop s ON p.shopID = s.shopID
         WHERE p.productCategory = 1
-          AND cmop.id = #{id} and p.groundMall like CONCAT('%', copi.organizeId, '%')
         group by p.productID
     </select>
 

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

@@ -274,10 +274,10 @@
             </td>
             <td>
                 <c:if test="${cmDiscernReceipt.organizeID == 1||cmDiscernReceipt.organizeID == 4}">
-                <span >线下凭证</span>
+               线下凭证
                 </c:if>
                 <c:if test="${!(cmDiscernReceipt.organizeID == 1||cmDiscernReceipt.organizeID == 4)}">
-                <span class="org-note"> ${cmDiscernReceipt.bankNameType}</span>
+              ${cmDiscernReceipt.bankNameType}
                 </c:if>
             </td>
             <td>
@@ -328,10 +328,11 @@
                 </c:if>
             </td>
             <td>
-                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orderType}</c:if>
-                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>
-                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
-                <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>
+                    ${cmDiscernReceipt.orderType}
+<%--                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orderType}</c:if>--%>
+<%--                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>--%>
+<%--                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>--%>
+<%--                <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>--%>
             </td>
            <td>   <%--  <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.orderID}）</a>--%>
 <%--                <c:if test="${cmDiscernReceipt.newReceiptType eq 2 && not empty cmDiscernReceipt.shopOrderNo}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.shopOrderId}）</a></c:if>--%>

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

@@ -68,11 +68,11 @@
             },{buttonsFocus:1,persistent: true});
         };
 
-        function revokeApply(id,orderID){
+        function revokeApply(id,orderID,shopOrderID){
             var msg='确定要撤销退款吗？';
             top.$.jBox.confirm(msg,'系统提示',function(v,h,f){
                 if(v=='ok'){
-                    window.location.href="${ctx}/bulkpurchase/cmRefundsProduct/revokeApply.rpc?id="+id+"&orderID="+orderID;
+                    window.location.href="${ctx}/bulkpurchase/cmRefundsProduct/revokeApply.rpc?id="+id+"&orderID="+orderID+"&shopOrderID="+shopOrderID;
                 }
                 return;
             },{buttonsFocus:1,persistent: true});
@@ -181,26 +181,29 @@
 						</c:if>
 						<c:if test="${not empty cmReturnedPurchase.refundOnlineFee && cmReturnedPurchase.refundOnlineFee ne 0 }">
 							<div>线上退回：<fmt:formatNumber type="number" pattern="#,##0.00"
-												   value="${cmReturnedPurchase.refundOnlineFee}" />元<br></div>
-						</c:if>
-						<c:if test="${not empty cmReturnedPurchase.refundOfflineFee && cmReturnedPurchase.refundOfflineFee ne 0 }">
-							<div>线下转账：<fmt:formatNumber type="number" pattern="#,##0.00"
-												   value="${cmReturnedPurchase.refundOfflineFee}" />元</div>
+														value="${cmReturnedPurchase.refundOnlineFee}"/>元<br></div>
 						</c:if>
+<%--						<c:if test="${not empty cmReturnedPurchase.refundOfflineFee && cmReturnedPurchase.refundOfflineFee ne 0 }">--%>
+<%--							<div>线下转账：<fmt:formatNumber type="number" pattern="#,##0.00"--%>
+<%--														value="${cmReturnedPurchase.refundOfflineFee}"/>元--%>
+<%--							</div>--%>
+<%--						</c:if>--%>
 					</c:if>
-					<c:if test="${empty cmReturnedPurchase.returnedWay}">
-						----
+					<c:if test="${not empty cmReturnedPurchase.refundOfflineFee && cmReturnedPurchase.refundOfflineFee ne 0 }">
+						<div>线下转账：<fmt:formatNumber type="number" pattern="#,##0.00"
+													value="${cmReturnedPurchase.refundOfflineFee}"/>元
+						</div>
 					</c:if>
 				</td>
 				<td>
 					----
-<%--						${cmReturnedPurchase.applicationUserName eq null?"----":cmReturnedPurchase.applicationUserName}--%>
+						<%--						${cmReturnedPurchase.applicationUserName eq null?"----":cmReturnedPurchase.applicationUserName}--%>
 				</td>
 				<td>${cmReturnedPurchase.returnTime eq null?"----":cmReturnedPurchase.returnTime}
 				</td>
 				<td>
 					----
-<%--						${cmReturnedPurchase.reviewUserName eq null?"----":cmReturnedPurchase.reviewUserName}--%>
+						<%--						${cmReturnedPurchase.reviewUserName eq null?"----":cmReturnedPurchase.reviewUserName}--%>
 				</td>
 				<td>
 					----
@@ -225,7 +228,7 @@
 						<%--线上退款,不可撤销--%>
 						<c:if test="${empty cmReturnedPurchase.refundOnlineFee || cmReturnedPurchase.refundOnlineFee eq 0 }">
 							<shiro:hasPermission name="order:cmReturnedPurchase:chexiao">
-							<a href="#" onclick="revokeApply(${cmReturnedPurchase.id},${cmReturnedPurchase.orderID})">撤销退款</a>
+							<a href="#" onclick="revokeApply(${cmReturnedPurchase.id},${cmReturnedPurchase.orderID},${cmReturnedPurchase.shopOrderID})">撤销退款</a>
 							</shiro:hasPermission>
 						</c:if>
 					</c:if>

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -809,8 +809,8 @@
         <tr>
             <th><span class="red">*</span>资质机构商品详情：</th>
             <td><span style="color: red">(适用于资质机构)</span></td>
-            <th  style="position: relative ;right: 200px"><span class="red">*</span>普通机构商品详情：</th>
-            <td style="position: relative ;right: 200px"><span style="color: red">(适用于游客和个人机构，可选择是否和资质机构商品详情相同，不相同的话需要编辑内容)</span>
+            <th  style="position: relative ;right: 500px"><span class="red">*</span>普通机构商品详情：</th>
+            <td style="position: relative ;right: 500px"><span style="color: red">(适用于游客和个人机构，可选择是否和资质机构商品详情相同，不相同的话需要编辑内容)</span>
                 <label>
                     <input type="radio"
                            name="productDetail"
@@ -833,7 +833,7 @@
                 </div>
             </td>
             <td colspan="3" style="vertical-align: top;">
-                <div class="detailInfoEditor" style="width: 620px;position: relative ;right: 200px">
+                <div class="detailInfoEditor" style="width: 620px;position: relative ;right: 500px">
                     <form:textarea path="commonDetailInfo" htmlEscape="false" class="input-xlarge required hide"/>
                     <!-- 富文本编辑器 -->
                     <div id="detailInfoEditor2">${product.commonDetailInfo==""||product.commonDetailInfo==null?"若要查看更多产品信息，请注册机构会员，如有疑问请联系客服。":product.commonDetailInfo}</div>
@@ -841,7 +841,7 @@
             </td>
         </tr>
         <tr>
-            <td colspan="4" style="text-align:center;">
+            <td colspan="4" style="text-align:center;position: relative ;right: 300px">
                 <shiro:hasPermission name="product:product:edit">
                     <input id="btnSave" class="btn btn-primary" type="submit" value="保 存" onclick="return checkInfo()"/>
                 </shiro:hasPermission>

src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -497,11 +497,10 @@
         <th>价格可见度</th>
         <th>商品详情可见度</th>
         <th>线上分帐号</th>
-        <th>商品状态</th>
+        <th>上架平台</th>
         <th>新品参与状态</th>
         <th>新品审核状态</th>
         <th>关联标签库</th>
-        <th>上架平台</th>
         <th>提交时间</th>
         <shiro:hasPermission name="product:product:edit">
             <th>操作</th>
@@ -605,44 +604,44 @@
                     <%--商品状态（0逻辑删除 1待审核 2已上架 3已下架 8审核未通过 9已隐身 10已冻结）--%>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 0}">
                         <font color="#a9a9a9">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已删除
                         </font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 1}">
                         <font color="red">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             待审核</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 2}">
                         <font color="green">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已上架</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 3}">
                         <font color="darkorange">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已下架</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 8}">
                         <font color="red">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             审核未通过</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 9}">
                         <font color="darkorange">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已隐身</font>
                     </c:if>
                     <c:if test="${cmOrganizeProductInfo.validFlag eq 10}">
                         <font color="darkorange">
-                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】</c:if>
+                            <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美集采联盟】</c:if>
                             <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
                             已冻结</font>
                     </c:if>
@@ -682,11 +681,7 @@
                     未关联
                 </c:if>
             </td>
-            <td class="font">
-                <c:forEach items="${product.organizeNames}" var="organize">
-                    <font>${organize}</font>
-                </c:forEach>
-            </td>
+
             <td>
                 <c:if test="${empty product.addTime}">
                     ---
@@ -743,15 +738,15 @@
 
                                         <a class="red" href="javascript:void(0);"
                                            onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.sqlShopPercent}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}')">
-                                            <c:if test="${ product.organizeNameValidFlag==1}">
-                                                <c:forEach items="${product.cmOrganizeProductInfos}"
-                                                           var="cmOrganizeProductInfo">
-                                                    <c:if test="${cmOrganizeProductInfo.validFlag eq 1||cmOrganizeProductInfo.validFlag eq 8}">
-                                                        <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】</c:if>
-                                                        <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>
-                                                    </c:if>
-                                                </c:forEach>
-                                            </c:if>
+<%--                                            <c:if test="${ product.organizeNameValidFlag==1}">--%>
+<%--                                                <c:forEach items="${product.cmOrganizeProductInfos}"--%>
+<%--                                                           var="cmOrganizeProductInfo">--%>
+<%--                                                    <c:if test="${cmOrganizeProductInfo.validFlag eq 1||cmOrganizeProductInfo.validFlag eq 8}">--%>
+<%--                                                        <c:if test="${cmOrganizeProductInfo.organizeId eq 0}">【采美】</c:if>--%>
+<%--                                                        <c:if test="${cmOrganizeProductInfo.organizeId eq 4}">【丽格集采联盟】</c:if>--%>
+<%--                                                    </c:if>--%>
+<%--                                                </c:forEach>--%>
+<%--                                            </c:if>--%>
                                             上架审核
                                         </a>
                                     </c:if>