门店商品修改，维权订单详情显示修改

kmall-admin/src/main/java/com/kmall/admin/dao/ProductStoreRelaDao.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import com.kmall.common.dao.BaseDao;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Dao
@@ -20,4 +21,6 @@ public interface ProductStoreRelaDao extends BaseDao<ProductStoreRelaEntity> {
     ProductStoreRelaEntity queryByStoreIdProductId(@Param("storeId") Long storeId, @Param("productId") Long productId);
 
     List<ProductStoreRelaEntity> queryByGoodsId(Long id);
+
+    List<ProductStoreRelaEntity> querySameList(Map<String, Object> map);
 }

kmall-admin/src/main/java/com/kmall/admin/entity/OrderEntity.java

@@ -105,11 +105,20 @@ public class OrderEntity implements Serializable {
     // 送到说明
     private String deliveryRemark;
     // 预计送达时间
-    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date predictTime;
 
     private String merchOrderSn;
 
+    private String orderBizType;
+
+    public String getOrderBizType() {
+        return orderBizType;
+    }
+
+    public void setOrderBizType(String orderBizType) {
+        this.orderBizType = orderBizType;
+    }
+
     private List<OrderGoodsEntity> orderGoodsEntityList;
 
     public String getMerchOrderSn() {

kmall-admin/src/main/java/com/kmall/admin/service/ProductStoreRelaService.java

@@ -32,6 +32,8 @@ public interface ProductStoreRelaService {
      */
     List<ProductStoreRelaEntity> queryList(Map<String, Object> map);
 
+    List<ProductStoreRelaEntity> querySameList(Map<String, Object> map);
+
     /**
      * 分页统计总数
      *

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -262,6 +262,7 @@ public class GoodsServiceImpl implements GoodsService {
             if (productStoreRelaEntityList != null && productStoreRelaEntityList.size() > 0) {
                 for (ProductStoreRelaEntity productStoreRela : productStoreRelaEntityList) {
                     productStoreRela.setRetailPrice(goods.getRetailPrice());
+                    productStoreRela.setMarketPrice(goods.getMarketPrice());
                     productStoreRelaDao.update(productStoreRela);
                 }
             }

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -385,7 +385,15 @@ public class OrderServiceImpl implements OrderService {
 
         Map logisticsInfo = new HashMap();
         List<WuliuEntity> wuliuEntityList = new ArrayList<>();
-        if (StringUtils.isNotEmpty(orderEntity.getShippingCode())
+        if(orderEntity.getOrderBizType().equals(Dict.orderBizType.item_10.getItem())
+                || orderEntity.getOrderBizType().equals(Dict.orderBizType.item_02.getItem())) {
+            WuliuEntity wuliuEntity = new WuliuEntity();
+            wuliuEntity.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(orderEntity.getAddTime()));
+            wuliuEntity.setAcceptStation(PrintTicketPropertiesBuilder.instance().getAddress()
+                    + "送达" + storeDao.queryObject(orderEntity.getStoreId()).getStoreAddress()
+                    + ";交易完成，用户已提走");
+            wuliuEntityList.add(wuliuEntity);
+        } else if (StringUtils.isNotEmpty(orderEntity.getShippingCode())
                 && StringUtils.isNotEmpty(orderEntity.getShippingNo())) {
             JSONObject traces = KdniaoUtil.getOrderTracesByJson(orderEntity.getShippingCode(), orderEntity.getShippingNo());
             List<Map> mapList = (List<Map>) traces.get("Traces");

kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -71,12 +72,21 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
             // 普通商品校验商品规格
             builder.put("specification", "规格");
             builder.put("retailPrice", "零售价");
+            builder.put("marketPrice", "市场价");
         }
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());
         }
 
+        Map<String, Object> map = new HashMap();
+        map.put("sku", goodsEntity.getSku());
+        map.put("storeId", productStoreRela.getStoreId());
+        List<ProductStoreRelaEntity> storeRelaList = querySameList(map);
+        if (storeRelaList != null && storeRelaList.size() > 0) {
+            throw new RRException("该门店已存在此商品！");
+        }
+
         SysUserEntity user = ShiroUtils.getUserEntity();
         ProductEntity product = productDao.queryObjectBySn(goodsEntity.getGoodsSn());
         if (Dict.orderBizType.item_11.getItem().equals(goodsEntity.getGoodsBizType())) {
@@ -93,6 +103,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
             productDao.update(product);
         } else {
             productStoreRela.setRetailPrice(goodsEntity.getRetailPrice());
+            productStoreRela.setMarketPrice(goodsEntity.getMarketPrice());
         }
 
         productStoreRela.setProductId(product.getId());
@@ -105,6 +116,10 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         return productStoreRelaDao.save(productStoreRela);
     }
 
+    public List<ProductStoreRelaEntity> querySameList(Map<String, Object> map) {
+        return productStoreRelaDao.querySameList(map);
+    }
+
     @Override
     public int update(ProductStoreRelaEntity productStoreRela) {
         Map<String, Object> valideDate = MapBeanUtil.fromObject(productStoreRela);
@@ -118,12 +133,22 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
             // 普通商品校验商品规格
             builder.put("specification", "规格");
             builder.put("retailPrice", "零售价");
+            builder.put("marketPrice", "市场价");
         }
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());
         }
 
+        Map<String, Object> map = new HashMap();
+        map.put("sku", goodsEntity.getSku());
+        map.put("storeId", productStoreRela.getStoreId());
+        map.put("id", productStoreRela.getId());
+        List<ProductStoreRelaEntity> storeRelaList = querySameList(map);
+        if (storeRelaList != null && storeRelaList.size() > 0) {
+            throw new RRException("该门店已存在此商品！");
+        }
+
         SysUserEntity user = ShiroUtils.getUserEntity();
         if (Dict.orderBizType.item_11.getItem().equals(goodsEntity.getGoodsBizType())) {
             // 添加商品规格

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -47,6 +47,7 @@
         <result property="deliveryDate" column="delivery_date"/>
         <result property="deliveryRemark" column="delivery_remark"/>
         <result property="predictTime" column="predict_time"/>
+        <result property="orderBizType" column="order_biz_type"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.OrderEntity">
@@ -161,7 +162,8 @@
 			`coupon_price`, 
 			`callback_status`,
 			`order_type`,
-			`store_id`
+			`store_id`,
+			`order_biz_type`
 		)
 		values
 		(
@@ -199,7 +201,8 @@
 			#{couponPrice}, 
 			#{callbackStatus},
 			#{orderType},
-			#{storeId}
+			#{storeId},
+			#{orderBizType}
 		)
 	</insert>
 
@@ -241,6 +244,7 @@
             <if test="callbackStatus != null">`callback_status` = #{callbackStatus},</if>
             <if test="orderType != null">`order_type` = #{orderType},</if>
             <if test="storeId != null">`store_id` = #{storeId},</if>
+            <if test="orderBizType != null">`order_biz_type` = #{orderBizType},</if>
         </set>
         where id = #{id}
     </update>

kmall-admin/src/main/resources/mybatis/mapper/OrderRefundDao.xml

@@ -24,18 +24,35 @@
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.admin.entity.OrderRefundEntity">
-		select
-			r.*,
-            o.order_sn,
-            o.order_status,
-            o.actual_price,
-            o.order_price,
-            o.goods_price,
-            o.add_time,
-			u.username as username
-		from mall_order_refund r
-        left join mall_order o on r.order_id = o.id
-        left join mall_user u on o.user_id = u.id
+		SELECT
+        r.id,
+        r.order_id,
+        r.user_id,
+        r.out_refund_no,
+        r.refund_id,
+        r.refund_type,
+        r.refund_time,
+        r.creator,
+        r.refund_money,
+        r.refund_status,
+        r.refund_reason,
+        r.wechat_refund_status_des,
+        r.refund_recv_accout,
+        r.approval_time,
+        r.approval_remark,
+        r.create_time,
+        o.order_sn,
+        o.order_status,
+        o.actual_price,
+        o.order_price,
+        o.goods_price,
+        o.add_time,
+        u.username AS username,
+        s.username AS approver
+        FROM mall_order_refund r
+        LEFT JOIN mall_order o ON r.order_id = o.id
+        LEFT JOIN mall_user u ON o.user_id = u.id
+        LEFT JOIN sys_user s ON s.user_id = r.approver
 		where r.id = #{id}
 	</select>
 
@@ -56,6 +73,9 @@
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>
+        <if test="userName != null and userName.trim() != ''">
+            AND u.username LIKE concat('%',#{userName},'%')
+        </if>
         <if test="orderId != null">
             AND o.id = #{orderId}
         </if>

kmall-admin/src/main/resources/mybatis/mapper/ProductStoreRelaDao.xml

@@ -133,6 +133,51 @@
         </if>
     </select>
 
+    <select id="querySameList" resultType="com.kmall.admin.entity.ProductStoreRelaEntity">
+        select
+        a.`id`,
+        a.`store_id`,
+        a.`product_id`,
+        a.`stock_num`,
+        a.`goods_id`,
+        a.`retail_price`,
+        a.`market_price`,
+        a.`stock_price`,
+        a.`sell_volume`,
+        a.sku,a.goods_biz_type, a.creater_sn, a.create_time, a.moder_sn, a.mod_time, a.tstm,
+        b.goods_sn goodsSn,
+        c.goods_sn productSn,
+        b.name goodsName,
+        cg.name categoryName,
+        s.store_name storeName
+        from mall_product_store_rela a
+        left join mall_goods b on a.goods_id = b.id
+        left join mall_product c on a.product_id = c.id
+        LEFT JOIN mall_category cg ON b.category_id = cg.id
+        left join mall_store s on a.store_id = s.id
+        WHERE 1=1 and b.is_delete = 0
+        <if test="sku != null">
+            AND b.sku = #{sku}
+        </if>
+        <if test="storeId != null">
+            AND a.store_id = #{storeId}
+        </if>
+        <if test="id != null">
+            AND a.id != #{id}
+        </if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+            <otherwise>
+                order by a.id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>
+
     <select id="queryTotal" resultType="int">
         select count(a.id)
         from mall_product_store_rela a

kmall-admin/src/main/webapp/WEB-INF/page/shop/orderrefund.html

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.userName" @on-enter="query" placeholder="名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
@@ -33,51 +33,67 @@
 
     <Card v-show="showList == 1">
         <p slot="title">{{title}}</p>
-		<i-form ref="formValidate" :model="orderRefund" :rules="ruleValidate" :label-width="80">
-            <Form-item label="订单Id" prop="orderId">
-                <i-input v-model="orderRefund.orderId" placeholder="订单Id"/>
+		<i-form ref="formValidate" :model="orderRefund" :label-width="180">
+            <Form-item label="订单编号" prop="orderSn">
+                <i-input v-model="orderRefund.orderSn" placeholder="订单编号" readonly/>
             </Form-item>
-            <Form-item label="用户Id" prop="userId">
-                <i-input v-model="orderRefund.userId" placeholder="用户Id"/>
+            <Form-item label="用户名称" prop="userName">
+                <i-input v-model="orderRefund.userName" placeholder="用户名称" readonly/>
             </Form-item>
             <Form-item label="商户退款单号" prop="outRefundNo">
-                <i-input v-model="orderRefund.outRefundNo" placeholder="商户退款单号"/>
+                <i-input v-model="orderRefund.outRefundNo" placeholder="商户退款单号" readonly/>
             </Form-item>
             <Form-item label="微信退款单号" prop="refundId">
-                <i-input v-model="orderRefund.refundId" placeholder="微信退款单号"/>
+                <i-input v-model="orderRefund.refundId" placeholder="微信退款单号" readonly/>
             </Form-item>
-            <Form-item label="退款类型 1用户全额退款 2系统部分退款" prop="refundType">
-                <i-input v-model="orderRefund.refundType" placeholder="退款类型 1用户全额退款 2系统部分退款"/>
+            <Form-item label="退款类型" prop="refundType" >
+                <i-select v-model="orderRefund.refundType" filterable placeholder="退款类型"
+                          label-in-value style="width: 240px;">
+                    <i-option v-for="refundType in refundTypeList" :value="refundType.value" :key="refundType.id">{{refundType.name}}
+                    </i-option>
+                </i-select>
             </Form-item>
             <Form-item label="退款时间" prop="refundTime">
-                <i-input v-model="orderRefund.refundTime" placeholder="退款时间"/>
-            </Form-item>
-            <Form-item label="" prop="creator">
-                <i-input v-model="orderRefund.creator" placeholder=""/>
+                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderRefund.refundTime" placeholder="退款时间" readonly style="width: 240px;"/>
             </Form-item>
             <Form-item label="退款金额" prop="refundMoney">
-                <i-input v-model="orderRefund.refundMoney" placeholder="退款金额"/>
+                <i-input v-model="orderRefund.refundMoney" placeholder="退款金额" readonly style="width: 240px;"/>
             </Form-item>
-            <Form-item label=" 退款状态 1申请中 2退款成功 3已拒绝" prop="refundStatus">
-                <i-input v-model="orderRefund.refundStatus" placeholder=" 退款状态 1申请中 2退款成功 3已拒绝"/>
+            <Form-item label="退款状态" prop="refundStatus">
+                <i-select v-model="orderRefund.refundStatus" filterable placeholder="退款状态"
+                          label-in-value style="width: 240px;">
+                    <i-option v-for="refundStatus in refundStatusList" :value="refundStatus.value" :key="refundStatus.id">{{refundStatus.name}}
+                    </i-option>
+                </i-select>
             </Form-item>
             <Form-item label="退款原因" prop="refundReason">
-                <i-input v-model="orderRefund.refundReason" placeholder="退款原因"/>
-            </Form-item>
-            <Form-item label="退款入账账户 1）退回银行卡：{银行名称}{卡类型}{卡尾号} 2）退回支付用户零钱:支付用户零钱3）退还商户:商户基本账户 商户结算银行账户4）退回支付用户零钱通:支付用户零钱通" prop="refundRecvAccout">
-                <i-input v-model="orderRefund.refundRecvAccout" placeholder="退款入账账户 1）退回银行卡：{银行名称}{卡类型}{卡尾号} 2）退回支付用户零钱:支付用户零钱3）退还商户:商户基本账户 商户结算银行账户4）退回支付用户零钱通:支付用户零钱通"/>
+                <i-input v-model="orderRefund.refundReason" placeholder="退款原因" readonly/>
+            </Form-item>
+            <Form-item label="退款入账账户" prop="refundRecvAccout">
+                <i-select v-model="orderRefund.refundRecvAccout" filterable placeholder="退款入账账户"
+                          label-in-value>
+                    <i-option v-for="refundRecvAccout in refundRecvAccoutList" :value="refundRecvAccout.value" :key="refundRecvAccout.id">{{refundRecvAccout.name}}
+                    </i-option>
+                </i-select>
+            </Form-item>
+            <Form-item label="微信退款状态" prop="wechatRefundStatusDes">
+                <i-select v-model="orderRefund.wechatRefundStatusDes" filterable placeholder="微信退款状态"
+                          label-in-value style="width: 240px;">
+                    <i-option v-for="wechatRefundStatusDes in wechatRefundStatusDesList" :value="wechatRefundStatusDes.value" :key="wechatRefundStatusDes.id">{{wechatRefundStatusDes.name}}
+                    </i-option>
+                </i-select>
             </Form-item>
             <Form-item label="审核人" prop="approver">
-                <i-input v-model="orderRefund.approver" placeholder="审核人"/>
+                <i-input v-model="orderRefund.approver" placeholder="审核人" readonly style="width: 240px;"/>
             </Form-item>
             <Form-item label="审核时间" prop="approvalTime">
-                <i-input v-model="orderRefund.approvalTime" placeholder="审核时间"/>
+                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderRefund.approvalTime" placeholder="审核时间" readonly style="width: 240px;"/>
             </Form-item>
             <Form-item label="审核备注" prop="approvalRemark">
-                <i-input v-model="orderRefund.approvalRemark" placeholder="审核备注"/>
+                <i-input type="textarea" v-model="orderRefund.approvalRemark" placeholder="审核备注" readonly/>
             </Form-item>
-            <Form-item label="创建时间,yyyy-MM-dd HH:mm:ss" prop="createTime">
-                <i-input v-model="orderRefund.createTime" placeholder="创建时间,yyyy-MM-dd HH:mm:ss"/>
+            <Form-item label="申请时间" prop="createTime">
+                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderRefund.createTime" placeholder="申请时间" readonly style="width: 240px;"/>
             </Form-item>
                 <!--<i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>-->
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html

@@ -121,6 +121,10 @@
                 <Input-number :min="0.01" :step="0.01" v-model="productStoreRela.retailPrice" placeholder="零售价格"
                               style="width: 268px;"/>
             </Form-item>
+            <Form-item  v-if="showInput" label="市场价" prop="marketPrice">
+                <Input-number :min="0.01" :step="0.01" v-model="productStoreRela.marketPrice" placeholder="零售价格"
+                              style="width: 268px;"/>
+            </Form-item>
         </i-form>
         <div style="padding-left: 20px">
             <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>

kmall-admin/src/main/webapp/js/shop/order.js

@@ -23,17 +23,21 @@ $(function () {
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
             {label: '订单号', name: 'orderSn', index: 'order_sn', width: 100},
             {label: '会员', name: 'userName', index: 'user_name', width: 80},
-            /*{
-                label: '订单类型', name: 'orderType', index: 'order_type', width: 80,
+            {
+                label: '订单业务类型', name: 'orderBizType', index: 'order_biz_type', width: 80,
                 formatter: function (value) {
-                    if (value == '1') {
-                        return '普通订单';
-                    } else if (value == '2') {
-                        return '团购订单';
+                    if (value == '00') {
+                        return '保税备货';
+                    } else if (value == '02') {
+                        return '保税展示补货';
+                    } else if (value == '10') {
+                        return '保税展示跨境';
+                    } else if (value == '11') {
+                        return '普通货物';
                     }
                     return '-';
                 }
-            },*/
+            },
             {
                 label: '订单状态', name: 'orderStatus', index: 'order_status', width: 80,
                 formatter: function (value) {
@@ -327,16 +331,7 @@ let vm = new Vue({
             });
         },
         refundUpdate: function (rowId) {
-            // if (null == vm.refundMoney) {
-            //     iview.Message.error("退款金额不能为空");
-            //     return;
-            // }
-            // if (vm.refundMoney < 0.01) {
-            //     iview.Message.error("退款金额不能小于0.01");
-            //     return;
-            // }
             let params = {};
-            // params.refundMoney = vm.refundMoney;
             params.orderId = rowId;
 
             $.ajax({

kmall-admin/src/main/webapp/js/shop/orderrefund.js

@@ -94,21 +94,24 @@ $(function () {
     });
 });
 
-let vm = new Vue({
+var vm = new Vue({
 	el: '#rrapp',
 	data: {
         showList: 0,
         title: null,
 		orderRefund: {},
 		ruleValidate: {
-			name: [
-				{required: true, message: '名称不能为空', trigger: 'blur'}
+            approvalRemark: [
+				{required: true, message: '审核备注不能为空', trigger: 'blur'}
 			]
 		},
 		q: {
             userName: ''
 		},
-
+        refundStatusList: [],
+        refundTypeList:[],
+        wechatRefundStatusDesList: [],
+        refundRecvAccoutList: []
 	},
 	methods: {
 		query: function () {
@@ -119,6 +122,26 @@ let vm = new Vue({
 			vm.title = "新增";
 			vm.orderRefund = {};
 		},
+        getRefundStatusList: function () {
+            $.get("../sys/macro/queryMacrosByValue?value=refundStatus", function (r) {
+                vm.refundStatusList = r.list;
+            });
+        },
+        getRefundTypeList: function () {
+            $.get("../sys/macro/queryMacrosByValue?value=refundType", function (r) {
+                vm.refundTypeList = r.list;
+            });
+        },
+        getWechatRefundStatusDesList: function () {
+            $.get("../sys/macro/queryMacrosByValue?value=wechatRefundStatusDes", function (r) {
+                vm.wechatRefundStatusDesList = r.list;
+            });
+        },
+        getRefundRecvAccoutList: function () {
+            $.get("../sys/macro/queryMacrosByValue?value=refundRecvAccout", function (r) {
+                vm.refundRecvAccoutList = r.list;
+            });
+        },
 		update: function (event) {
             let id = getSelectedRow();
 			if (id == null) {
@@ -178,7 +201,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                userName: ''
             }
             vm.reload();
 		},
@@ -229,8 +252,12 @@ let vm = new Vue({
             vm.showList = 1;
             vm.title = "维权订单详情";
             $.get("../orderrefund/info/" + rowId, function (r) {
-                vm.orderRefund = r.orderRefund;
+                vm.orderRefund = r.orderRefund;alert(vm.orderRefund.refundType);
             });
+            vm.getRefundStatusList();
+            vm.getRefundTypeList();
+            vm.getWechatRefundStatusDesList();
+            vm.getRefundRecvAccoutList();
         }
 	}
 });

kmall-admin/src/main/webapp/js/shop/storeProductStock.js

@@ -102,7 +102,7 @@ var vm = new Vue({
         uploadList: [],
         imgName: '',
         visible: false,
-        productStoreRela: { stockNum: '', retailPrice: '' },
+        productStoreRela: { stockNum: '', retailPrice: '', marketPrice: '' },
         ruleValidate: {
             /*storeId: [
                 {required: true, message: '门店不能为空'}
@@ -147,7 +147,7 @@ var vm = new Vue({
             vm.showList = false;
             vm.title = "新增";
             vm.uploadList = [];
-            vm.productStoreRela = { stockNum: '', retailPrice: '' };
+            vm.productStoreRela = { stockNum: '', retailPrice: '', marketPrice: '' };
             vm.getMacro();
             vm.getGoods();
         },

kmall-api/src/main/java/com/kmall/api/api/ApiOrderController.java

@@ -299,7 +299,8 @@ public class ApiOrderController extends ApiBaseAction {
         }
         List<WuliuVo> wuliuList = new ArrayList<WuliuVo>();
 
-        if(orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_10.getItem())
+        if((orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_10.getItem())
+                || orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_02.getItem()))
                 && orderInfo.getOrder_status() == Integer.parseInt(Dict.orderStatus.item_301.getItem())){
             WuliuVo vo = new WuliuVo();
             vo.setAcceptStation("交易完成，用户已提走");