上朵

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -942,45 +942,7 @@
 
 	<select id="getOrderListToExcel" resultMap="BaseResultMap" parameterType="Order" >
 		select
-			t.sales_orderid,
-			t.sales_openid,
-			t.sales_yet_amount,
-			t.sales_amount,
-			t.sales_reward_num,
-			t.sales_integral_num,
-			t.sales_rate_amount,
-			t.sales_create_date,
-			t.sales_reward_integral_num,
-			t.sales_post_num,
-			t.sales_post_firm,
-			t.sales_status,
-			t.sales_send_date,
-			t.sales_return_date,
-			t.sales_address_info,
-			t.sales_address_postnum,
-			t.sales_address_tel,
-			t.sales_address_name,
-			t.sales_return_des,
-			t.sales_admin_remark,
-			t.sales_user_remark,
-			t.sales_transaction_id,
-			t.sales_transaction_date,
-			t.sales_refund_no,
-			t.sales_transaction_refund_id,
-			t.sales_color_type,
-			t.sales_proxy_reward,
-			t.sales_lock_type,
-			t.sales_coupon_receive_id,
-			t.sales_balance_amount,
-			t.sales_porderid,
-			t.sales_order_type,
-			t.sales_is_rfund,
-			t.sales_audit_remark,
-			t.sales_is_customized,
-			t.sales_transportation_type,
-			t.sales_channel_type,
-			t.sales_channel_id,
-			t.sales_channel_address,
+			t.*,
 			chan.sales_channel_name,
 			uuer.user_nickname
 		from tb_iamberry_shop_sales_order t

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/channelAdminMapper.xml

@@ -75,6 +75,9 @@
             <if test="salesStatus != null ">
                 AND so.sales_status = #{salesStatus}
             </if >
+            <if test="salesStatus == null ">
+                AND so.sales_status IN (2,3,5,6,7,8,9,10,11,12)
+            </if >
         </where>
     </select>
 
@@ -177,6 +180,9 @@
             <if test="salesStatus != null ">
                 AND so.sales_status = #{salesStatus}
             </if >
+            <if test="salesStatus == null ">
+                AND so.sales_status IN (2,3,5,6,7,8,9,10,11,12)
+            </if >
         </where>
         ORDER BY so.sales_orderid DESC
     </select>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/channelRebateMapper.xml

@@ -40,7 +40,7 @@
        LEFT JOIN tb_iamberry_shop_order_item oi on oi.item_id = t.rebate_item_id
        LEFT JOIN tb_iamberry_product_color pc on pc.color_id = oi.item_color_id
         <where>
-            so.sales_status IN (2,3,4,5,6,7,8,9,10,11,12)
+            so.sales_status IN (2,3,5,6,7,8,9,10,11,12)
             <if test="rebateId != null   and rebateId != '' ">
                 AND t.rebate_id = #{rebateId}
             </if >

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -1094,6 +1094,7 @@ public class AdminOrderHandlers {
         titles.add("收货人");
         titles.add("昵称");
         titles.add("手机号码");
+        titles.add("邮寄方式");
         titles.add("渠道层级");
         titles.add("渠道名称");
         model.put("titles", titles);
@@ -1171,6 +1172,12 @@ public class AdminOrderHandlers {
                 row.add(info.getUserNickname() == null ? "":info.getUserNickname());
                 row.add(info.getSalesAddressTel() == null ? "":info.getSalesAddressTel());
 
+                if(info.getSalesTransportationType() == 2){ // 1:邮寄  2:自提
+                    row.add("自提");
+                }else{
+                    row.add("邮寄");
+                }
+
                 if(info.getSalesChannelType() != null) {    //1:主渠道  2:子渠道
                     if (info.getSalesChannelType() == 1) {
                         row.add("主渠道");