机构画像

src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -131,24 +131,24 @@ public class ClubPortraitService {
                     // 普通订单
                     if (("0".equals(order.getSecondHandOrderFlag()) || StringUtils.isEmpty(order.getSecondHandOrderFlag()))
                             && (!"1".equals(order.getRebateFlag()) || "".equals(order.getRebateFlag()) || StringUtils.isEmpty(order.getRebateFlag()))
-                            && ((!"1".equals(order.getRefundType()) && !"2".equals(order.getRefundType())) || "".equals(order.getRefundType()) || StringUtils.isEmpty(order.getRefundType()))
-                            && !"6".equals(order.getStatus())) {
+                            && ((!"2".equals(order.getRefundType())) || "".equals(order.getRefundType()) || StringUtils.isEmpty(order.getRefundType()))
+                            && !"4".equals(order.getStatus())) {
                         ordinary++;
                     }
                     // 二手订单
                     if ("1".equals(order.getSecondHandOrderFlag()) && !"1".equals(order.getRebateFlag())
-                            && (!"1".equals(order.getRefundType()) && !"2".equals(order.getRefundType())) && !"6".equals(order.getStatus())) {
+                            && (!"2".equals(order.getRefundType())) && !"4".equals(order.getStatus())) {
                         secondHand++;
                     }
                     // 返佣订单
                     if ("1".equals(order.getRebateFlag()) &&
-                            (!"1".equals(order.getRefundType()) && !"2".equals(order.getRefundType()) || StringUtils.isEmpty(order.getRefundType())) && !"6".equals(order.getStatus())) {
+                            (!"2".equals(order.getRefundType()) || StringUtils.isEmpty(order.getRefundType())) && !"4".equals(order.getStatus())) {
                         rebate++;
                     }
                     // 部分退款
-                    if ("1".equals(order.getRefundType()) && !"6".equals(order.getStatus())) {
+                    /*if ("1".equals(order.getRefundType()) && !"4".equals(order.getStatus())) {
                         partialRefund++;
-                    }
+                    }*/
                     // 全部退款
                     /*if ("2".equals(order.getRefundType()) && !"6".equals(order.getStatus())) {
                         fullRefund++;

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

@@ -4,8 +4,8 @@
 
     <select id="selTotal" resultType="com.caimei.modules.user.entity.CmPortrait">
         SELECT
-                (SELECT COUNT(orderID) FROM cm_order WHERE clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2 AND orderTime <![CDATA[ < ]]> now()) AS orderTotal,
-                (SELECT SUM(payTotalFee) FROM cm_order WHERE clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2 AND orderTime <![CDATA[ < ]]> now()) AS orderTotalAmount,
+                (SELECT COUNT(shopOrderId) FROM cm_shop_order WHERE clubID = #{clubID} AND shopStatus != 4 AND shopStatus != 5 AND refundStatus != 2 AND orderTime <![CDATA[ < ]]> NOW()) AS orderTotal,
+                (SELECT IFNULL(SUM(totalAmount), 0) FROM cm_shop_order WHERE clubID = #{clubID} AND shopStatus != 4 AND shopStatus != 5 AND refundStatus != 2 AND orderTime <![CDATA[ < ]]> NOW()) AS orderTotalAmount,
                 (SELECT COUNT(cbr.recordID) FROM cm_behavior_record cbr LEFT JOIN club c ON cbr.userID = c.userID WHERE cbr.pageType IN (8, 9) AND c.clubID = #{clubID} AND cbr.accessDate <![CDATA[ < ]]> now()) AS totalkeywords ,
                 (SELECT COUNT(remarks) FROM cm_club_remarks WHERE clubID = #{clubID} AND addTime <![CDATA[ < ]]> now()) AS remarksTotal
     </select>
@@ -47,20 +47,21 @@
 
     <select id="selOrderList" resultType="com.caimei.modules.order.entity.NewOrder">
         SELECT
-               (SELECT COUNT(orderID) FROM cm_order WHERE clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2) as numbers,
-                (SELECT SUM(payTotalFee) FROM cm_order WHERE clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2) as totalMoney,
-               clubID,
-               secondHandOrderFlag,
-               rebateFlag,
-               refundType,
-               payTotalFee,
-               STATUS,
-               orderTime
-        FROM cm_order
+        (SELECT COUNT(shopOrderId) FROM cm_shop_order WHERE clubID = 7814 AND shopStatus != 4 AND shopStatus != 5 AND refundStatus != 2 AND orderTime <![CDATA[ < ]]> NOW()) AS orderTotal,
+        (SELECT IFNULL(SUM(totalAmount), 0) FROM cm_shop_order WHERE clubID = 7814 AND shopStatus != 4 AND shopStatus != 5 AND refundStatus != 2 AND orderTime <![CDATA[ < ]]> NOW()) AS orderTotalAmount,
+        cso.clubID,
+        co.secondHandOrderFlag,
+        co.rebateFlag,
+        cso.totalAmount AS payTotalFee,
+        ifnull(cso.refundStatus,1) as refundType,
+        cso.shopStatus AS STATUS,
+        cso.orderTime
+        FROM cm_shop_order cso
+        LEFT JOIN cm_order co ON cso.orderId = co.orderId
         <where>
-             clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2
+            cso.clubID = #{clubID} AND cso.shopStatus != 4 AND cso.shopStatus != 5 AND cso.refundStatus != 2
              <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                 AND orderTime <![CDATA[ >= ]]> #{startTime} AND orderTime <![CDATA[ <= ]]> #{endTime}
+                 AND cso.orderTime <![CDATA[ >= ]]> #{startTime} AND cso.orderTime <![CDATA[ <= ]]> #{endTime}
              </if>
         </where>
     </select>

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

@@ -761,32 +761,32 @@
                 <label><input type="radio" name="step" value="2"  ${product.step == "2" ? "checked" : ""}>以起订量增长</label>
             </td>
         </tr>
-        <tr>
-            <th><span class="red">*</span>运费：</th>
-                <%--<td colspan="3">
-                    <label><input type="radio" name="byFlag" value="0"  ${product.byFlag == "0" ? "checked" : ""}>买家承担<b class="line">|</b></label>
-                    <label><input type="radio" name="byFlag" value="1"  ${product.byFlag == "1" ? "checked" : ""}>卖家承担</label>
-                </td>--%>
-            <td colspan="3">
-                <label><input type="radio" name="freePostFlag"
-                              value="2"  ${(empty product.freePostFlag || product.freePostFlag eq "2") ? "checked" : ""}>默认（遵循运费规则）<b
-                        class="line">|</b></label>
-                <label><input type="radio" name="freePostFlag"
-                              value="0"  ${product.freePostFlag == "0" ? "checked" : ""}>包邮<b class="line">|</b></label>
-                <label><input type="radio" name="freePostFlag"
-                              value="1"  ${product.freePostFlag == "1" ? "checked" : ""}>到付</label>
-            </td>
-        </tr>
-        <tr>
-            <th><span class="red">*</span>销售区域：</th>
-            <td colspan="3">
-                <label><input type="radio" name="allAreaFlag" value="1"
-                              onchange="changeAreaFlag()" ${product.allAreaFlag == "1" ? "checked" : ""}>全部区域<b
-                        class="line">|</b></label>
-                <label><input type="radio" name="allAreaFlag" value="0"
-                              onchange="changeAreaFlag()" ${product.allAreaFlag == "1" ? "" : "checked"}>指定区域</label>
-            </td>
-        </tr>
+            <%--<tr>
+                <th><span class="red">*</span>运费：</th>
+                    <td colspan="3">
+                        <label><input type="radio" name="byFlag" value="0"  ${product.byFlag == "0" ? "checked" : ""}>买家承担<b class="line">|</b></label>
+                        <label><input type="radio" name="byFlag" value="1"  ${product.byFlag == "1" ? "checked" : ""}>卖家承担</label>
+                    </td>
+                <td colspan="3">
+                    <label><input type="radio" name="freePostFlag"
+                                  value="2"  ${(empty product.freePostFlag || product.freePostFlag eq "2") ? "checked" : ""}>默认（遵循运费规则）<b
+                            class="line">|</b></label>
+                    <label><input type="radio" name="freePostFlag"
+                                  value="0"  ${product.freePostFlag == "0" ? "checked" : ""}>包邮<b class="line">|</b></label>
+                    <label><input type="radio" name="freePostFlag"
+                                  value="1"  ${product.freePostFlag == "1" ? "checked" : ""}>到付</label>
+                </td>
+            </tr>
+            <tr>
+                <th><span class="red">*</span>销售区域：</th>
+                <td colspan="3">
+                    <label><input type="radio" name="allAreaFlag" value="1"
+                                  onchange="changeAreaFlag()" ${product.allAreaFlag == "1" ? "checked" : ""}>全部区域<b
+                            class="line">|</b></label>
+                    <label><input type="radio" name="allAreaFlag" value="0"
+                                  onchange="changeAreaFlag()" ${product.allAreaFlag == "1" ? "" : "checked"}>指定区域</label>
+                </td>
+            </tr>--%>
         <tr>
             <th><span class="red">*</span>首页新品展示：</th>
             <td colspan="3">