1.0.4

src/main/java/com/caimei/modules/order/dao/NewShopOrderDao.java

@@ -2,6 +2,7 @@ package com.caimei.modules.order.dao;
 
 import com.caimei.modules.order.entity.NewShopOrder;
 import com.caimei.modules.order.entity.SettleRecord;
+import com.caimei.modules.product.entity.Shop;
 import com.caimei.po.neworder.CmShopOrder;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
@@ -30,6 +31,8 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
     List<NewShopOrder> findListByOrderID(@Param("orderID") Integer orderID);
 
+    Shop getShopOrderId(@Param("shopId") Integer shopId);
+
     List<String> findCommercialCode(@Param("orderID") Integer orderID);
 
     String FromUnionId(Integer orderId);

src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -156,7 +156,7 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private String clubName; //会所名称
     private Integer orderArchiveId; //订单资料id
     private String rebateFee; //主订单返佣服务费
-    private String shopPostFlag; //免邮标志 运费：-1到付，0包邮，1需要运费,-2仪器到付其它包邮
+    private String shopPostFlag; //免邮标志 运费：2到付，0包邮，1需要运费,-2仪器到付其它包邮
     private String postageInfo; //运费字符串
 
     /**  */

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

@@ -3,7 +3,6 @@ package com.caimei.modules.order.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.caimei.constants.UserType;
-import com.caimei.exception.BusinessException;
 import com.caimei.modules.bulkpurchase.dao.OrderInvoiceDao;
 import com.caimei.modules.bulkpurchase.entity.OrderInvoice;
 import com.caimei.modules.bulkpurchase.service.OrderInvoiceService;
@@ -1457,6 +1456,25 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                             shopOrder.setRestAmount(0d);
                         }
                     }
+                    // 子订单来自采美平台的第三方供应商的线下转账账号为空或者为采美账号
+                    Shop shop = newShopOrderDao.getShopOrderId(shopOrder.getShopID());
+                    boolean flag = null == shop.getBankAccount() || 0 == shop.getAccountOwnership();
+                    // 订单收款路径 线上、 线下
+                    Integer discernPayWay = cmReceiptOrderRelationDao.getDiscernPayWay(shopOrder.getOrderID());
+                    /** 排除以下情况的订单
+                     * （1）采美自营供应商（综合供应商）的子订单
+                     * （2）颜选商城的子订单
+                     * （3）来自采美平台的第三方供应商的线下转账账号为空或者为采美账号的子订单
+                     * （4）商品分账号是采美信息的商品的子订单（走了线上支付才排除）
+                     */
+                    if ((1161 != shopOrder.getShopID() || 2 != shopOrder.getOrderType() || !flag ||
+                            (!"E1807059160".equals(shopOrder.getSplitCode()) &&  null != discernPayWay && 1 == discernPayWay))) {
+                        // 线下支付的订单
+                        if (null != discernPayWay && 1 != discernPayWay) {
+                            // 订单下线收款， 付款状态与收款状态同步显示
+                            shopOrder.setPayStatus(shopOrder.getReceiptStatus());
+                        }
+                    }
                     // 订单已收款才会出现抹平或者多收退余额，（已收再退款或者撤销退款订单即使存在抹平也需要当未抹平重新计算付款）
                     String receiptStatus = shopOrder.getReceiptStatus();
                     if (StringUtils.equals("3", receiptStatus)) {

src/main/java/com/caimei/modules/product/entity/Shop.java

@@ -82,6 +82,8 @@ public class Shop extends DataEntity<Shop> {
 	private String cooperateFlag; //
 	private String businessScope; //
 	private Integer bail; // 是否已缴纳保证金(0 没有,1 有)
+	private Integer AccountOwnership; // 账号归属 0采美 1 供应商
+	private String bankAccount;	//收款卡号
 	private List<ShopCert> shopCertList;//商品资质认证
 	private String shopIds;	//商店id,","隔开
 	private List<Integer> ids; //商店id列表
@@ -89,4 +91,4 @@ public class Shop extends DataEntity<Shop> {
 	private String delShopIds;//删除的商店id,以,隔开
 	private List<Integer> delShopIdList;//删除的商品id列表
 	private Integer shopType;
-}
+}

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

@@ -279,6 +279,10 @@
         WHERE a.orderID = #{orderID} ORDER BY a.shopOrderNo DESC
     </select>
 
+    <select id="getShopOrderId" resultType="com.caimei.modules.product.entity.Shop">
+        select shopId, AccountOwnership, bankAccount from shop where shopId = #{shopId}
+    </select>
+
     <select id="findCommercialCode" resultType="String">
         select commercialCode
         FROM cm_shop_order a

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

@@ -377,6 +377,7 @@
             display: inline-block;
             border-radius: 2px
         }
+        .acticer_span{display: inline-block;width: 14px;height: 14px;border-radius: 50%;box-sizing: border-box;border: 1px solid #999999;text-align: center;color: #333333;font-size: 12px;line-height: 14px;float: none;margin-left: 3px;}
     </style>
     <script type="text/javascript" src="${ctxStatic}/QRCode/jquery.qrcode.min.js"></script>
     <script type="text/javascript" src="static/common/clipboard.min.js"></script>