Merge branch 'developer' into developerB

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

@@ -160,15 +160,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                     Integer returnNum = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
                     returnNum = returnNum == null ? 0 : returnNum;
                     p.setReturnedNum(returnNum);
-                    /*if ( returnNum!=null && returnNum>0 ){
-                        if (p.getPresentNum()>0) {
-                            p.setNum(0);
-                            p.setPresentNum(0);
-                        } else {
-                            p.setNum(p.getNum()-returnNum);
-                        }
-                    }
-                    p.setReturnedNum(returnNum == null ? 0 : returnNum > 0 ? returnNum : 0);*/
                 }
                 so.setNewOrderProducts(orderProductList);
                 so.setWaitPayShop((so.getShouldPayShopAmount() == null ? 0D : so.getShouldPayShopAmount()) - (so.getPayedShopAmount() == null ? 0D : so.getPayedShopAmount()));
@@ -180,6 +171,8 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                     if ("2".equals(newOrder.getOrderType())) {
                         //呵呵商城订单
                         so.setOrderType(2);
+                        String name = heHeNewOrderDao.findHeUser(newOrder.getUserID());
+                        so.setClubName(name);
                     }
                 } else {
                     so.setReceiptStatus("1");

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

@@ -3,6 +3,7 @@ package com.caimei.modules.order.service;
 
 import com.caimei.modules.bulkpurchase.dao.BpOrderUserinfoDao;
 import com.caimei.modules.bulkpurchase.entity.BpOrderUserinfo;
+import com.caimei.modules.hehe.dao.HeHeNewOrderDao;
 import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.utils.ProductType;
@@ -65,6 +66,8 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
     private BpOrderUserinfoDao bpOrderUserinfoDao;
     @Resource
     private CmPromotionDao cmPromotionDao;
+    @Resource
+    private HeHeNewOrderDao heHeNewOrderDao;
 
 
     public List<NewShopOrder> findListByOrderID() {
@@ -269,6 +272,8 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
                 if ("2".equals(newOrder.getOrderType())) {
                     //呵呵商城订单
                     so.setOrderType(2);
+                    String name = heHeNewOrderDao.findHeUser(newOrder.getUserID());
+                    so.setClubName(name);
                 }
             } else {
                 so.setReceiptStatus("1");
@@ -461,6 +466,12 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             order.setReturnedFreightFlag(returnedFreightFlag);
             order.setShouldPayShopAmount(shouldPayShopAmount);
             order.setNewShopOrders(list);
+
+            if ("2".equals(order.getOrderType())) {
+                //呵呵商城订单
+                String name = heHeNewOrderDao.findHeUser(order.getUserID());
+                order.setClubName(name);
+            }
         }
         return page;
     }

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

@@ -75,11 +75,11 @@
             <if test="id != null and id != '' and id != 0 ">
                 AND a.id = #{id}
             </if>
-            <if test="organizeID != null and organizeID != '' and organizeID != 0 ">
+            <if test="organizeID != null and organizeID != 9999 ">
                 AND cr.organizeID = #{organizeID}
             </if>
-            <if test="organizeID == 0 ">
-                AND (cr.organizeID IS NULL OR cr.organizeID = 2)
+            <if test="organizeID == 9999 ">
+                AND cr.orderType = 2
             </if>
             <if test="startTime != null and startTime != ''">
                 AND (a.receiptDate &gt; #{startTime} OR a.receiptDate = #{startTime})

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

@@ -101,9 +101,12 @@
 			<if test="orderID != null and orderID != ''">
 				AND a.id in (SELECT cpsr.payShopID FROM cm_pay_shop_record  cpsr LEFT JOIN cm_shop_order so ON so.shopOrderID=cpsr.shopOrderID WHERE so.orderID=#{orderID})
 			</if>
-			<if test="organizeID != null and organizeID != ''">
+			<if test='organizeID != null and organizeID != "" and organizeID != "9999"'>
 				AND a.id in (SELECT cpsr.payShopID FROM cm_pay_shop_record  cpsr LEFT JOIN cm_shop_order so ON so.shopOrderID=cpsr.shopOrderID WHERE so.organizeID = #{organizeID})
 			</if>
+			<if test='organizeID == "9999"'>
+				AND a.id IN (SELECT cpsr.payShopID FROM cm_pay_shop_record  cpsr LEFT JOIN cm_shop_order so ON so.shopOrderID=cpsr.shopOrderID WHERE so.orderType = 2)
+			</if>
 			<if test="orderNo != null and orderNo != ''">
 				AND a.id in (SELECT cpsr.payShopID FROM cm_pay_shop_record  cpsr LEFT JOIN cm_shop_order so ON so.shopOrderID=cpsr.shopOrderID WHERE so.orderNo LIKE CONCAT('%',#{orderNo},'%'))
 			</if>

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

@@ -38,7 +38,7 @@
 		left join shop s on s.shopID = a.shopID
 		left join sys_user u on u.id = a.operator
 		<where>
-			<if test="organizeID != null and organizeID != '' and organizeID != 0 ">
+			<if test="organizeID != null and organizeID != 9999 and organizeID != 0 ">
 				AND a.id IN (
 				SELECT DISTINCT crsr.refundShopID FROM cm_refund_shop_record crsr
 				LEFT JOIN cm_shop_order cso ON crsr.shopOrderID=cso.shopOrderID
@@ -49,7 +49,14 @@
 				AND a.id IN (
 				SELECT DISTINCT crsr.refundShopID FROM cm_refund_shop_record crsr
 				LEFT JOIN cm_shop_order cso ON crsr.shopOrderID=cso.shopOrderID
-				WHERE organizeID IS NULL or organizeID = 2
+				WHERE organizeID IS NULL or organizeID = 0
+				)
+			</if>
+			<if test="organizeID == 9999 ">
+				AND a.id IN (
+				SELECT DISTINCT crsr.refundShopID FROM cm_refund_shop_record crsr
+				LEFT JOIN cm_shop_order cso ON crsr.shopOrderID=cso.shopOrderID
+				WHERE cso.orderType = 2
 				)
 			</if>
 			<if test="id != null and id != ''">

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

@@ -637,9 +637,12 @@
             <if test="orderID != null and orderID != ''">
                 AND co.orderID = #{orderID}
             </if>
-			<if test="organizeID != null">
+			<if test="organizeID != null and organizeID != 9999">
 				AND co.organizeID = #{organizeID}
 			</if>
+			<if test="organizeID == 9999">
+				AND co.orderType = 2
+			</if>
             <if test="orderNo != null and orderNo != ''">
                 AND co.orderNo like concat('%', #{orderNo} ,'%')
             </if>

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

@@ -770,12 +770,12 @@
             <if test="orderID != null and orderID != ''">
                 AND a.orderID = #{orderID}
             </if>
-            <if test="organizeID != null and organizeID != '' and organizeID != 0 ">
-                AND a.organizeID = #{organizeID}
-            </if>
-            <if test="organizeID == 0 ">
-                AND (a.organizeID IS NULL OR a.organizeID = 2)
+            <if test="organizeID != null and organizeID != 9999">
+                AND co.organizeID = #{organizeID}
             </if>
+			<if test="organizeID == 9999 ">
+				AND co.orderType = 2
+			</if>
             <if test="orderNo != null and orderNo != ''">
                 AND a.orderNo like concat('%', #{orderNo} ,'%')
             </if>

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

@@ -143,6 +143,7 @@
             <form:select path="organizeID" class="select-ele input-medium required">
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
+                <form:option value="9999" label="呵呵商城"/>
                 <c:forEach items="${organizeList}" var="organize" varStatus="index">
                     <form:option value="${organize.id}" label="${organize.organizeName}"/>
                 </c:forEach>
@@ -256,7 +257,13 @@
                         <c:if test="${s.organizeID == '1'}">
                             <span class="org-note">星范</span>
                         </c:if>
-                            ${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                            ${s.clubName}
+                        <c:if test="${s.orderType eq 2}">
+                            <font color="red">(呵呵商城)</font>
+                        </c:if>
+                        <c:if test="${s.organizeID == 3}">
+                            <em class="weishaIcon">维沙</em>
+                        </c:if>
                     </td>
                     <td><fmt:formatNumber value="${s.discountFee}" type="number" pattern="#,##0.00"/></td>
                     <td>

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

@@ -145,6 +145,7 @@
             <form:select path="organizeID" class="input-medium">
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
+                <form:option value="9999" label="呵呵商城"/>
                 <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
                               htmlEscape="false"/>
             </form:select>

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

@@ -74,6 +74,7 @@
 				<form:select path="organizeID" class="input-medium">
 					<form:option value="" label="请选择"/>
 					<form:option value="0" label="采美"/>
+					<form:option value="9999" label="呵呵商城"/>
 					<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
 								  htmlEscape="false"/>
 				</form:select>

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

@@ -334,6 +334,7 @@
             <form:select path="organizeID" class="input-medium">
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
+                <form:option value="9999" label="呵呵商城"/>
                 <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id" htmlEscape="false"/>
             </form:select>
         </div>

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

@@ -116,6 +116,7 @@
 			<form:select path="organizeID" class="input-medium">
 				<form:option value="" label="请选择"/>
 				<form:option value="0" label="采美"/>
+				<form:option value="9999" label="呵呵商城"/>
 				<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id" htmlEscape="false"/>
 			</form:select>
 		</div>

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

@@ -78,6 +78,7 @@
 				<form:select path="organizeID" class="select-ele input-medium">
 					<form:option value="" label="请选择"/>
 					<form:option value="0" label="采美"/>
+					<form:option value="9999" label="呵呵商城"/>
 					<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
 								  htmlEscape="false"/>
 				</form:select>

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

@@ -260,16 +260,16 @@
             <c:if test="${order.discountFee le 0}">¥0.00</c:if>
         </td>
         <td>运费：
-            <c:if test="${order.freight == 0}">
+            <c:if test="${order.freePostFlag == 0}">
                 包邮
             </c:if>
-            <c:if test="${order.freight == -1}">
+            <c:if test="${order.freePostFlag == -1}">
                 到付
             </c:if>
-            <c:if test="${order.freight == -2}">
+            <c:if test="${order.freePostFlag == -2}">
                 仪器到付-产品包邮
             </c:if>
-            <c:if test="${order.freight != -1 && order.freight != 0 && order.freight != -2}">
+            <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
                 <fmt:formatNumber value="${order.freight}" type="currency"/>
             </c:if>
         </td>