采美信息账号订单后续处理

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

@@ -156,6 +156,8 @@ public class NewOrder extends DataEntity<NewOrder> {
 
     private Integer productCategory;//商品订单状态 1.普通订单 2.二手订单
 
+    private Integer produtCode;//订单商品是否是采美信息分帐号收款的线上支付子订单
+
 
     /**
      * 呵呵商城优惠券
@@ -1202,5 +1204,13 @@ public class NewOrder extends DataEntity<NewOrder> {
     public void setNewOrderProducts(List<NewOrderProduct> newOrderProducts) {
         this.newOrderProducts = newOrderProducts;
     }
+
+    public Integer getProdutCode() {
+        return produtCode;
+    }
+
+    public void setProdutCode(Integer produtCode) {
+        this.produtCode = produtCode;
+    }
 }
 

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

@@ -1405,6 +1405,12 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                             if (null == newOrderProduct.getCancelProductNum()) {
                                 newOrderProduct.setCancelProductNum(0);
                             }
+                            // 判断商品是否是采美信息分帐号收款
+                            if ("E1807480235".equals(newOrderProduct.getSplitCode())) {
+                                newOrder.setProdutCode(1);
+                            } else {
+                                newOrder.setProdutCode(2);
+                            }
                             for (CmReturnedPurchaseProduct cmReturnedPurchaseProduct : cmReturnedPurchaseProductList) {
                                 Boolean isFirstReturn = false;
                                 if (newOrderProduct.getShopOrderID().equals(cmReturnedPurchaseProduct.getShopOrderID())

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

@@ -233,4 +233,4 @@ public class ClubTemporaryService extends CrudService<ClubTemporaryDao, ClubTemp
     public ClubTemporary findByConfirmUserId(Integer userId) {
         return clubTemporaryDao.findByConfirmUserId(userId);
     }
-}
+}

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

@@ -92,7 +92,8 @@
           a.svipPriceFlag,
 		  a.svipPriceType,
 		  a.svipDiscount,
-		  a.svipReduction
+		  a.svipReduction,
+		  p.splitCode
 	</sql>
 
     <sql id="orderProductJoins">
@@ -565,6 +566,7 @@
 		cop.orderProductID AS orderProductID,
 		cop.productID AS productID,
 		p.unit AS unit,
+	    p.splitCode as splitCode,
 		cop.num AS num,
 		cop.presentNum AS presentNum,
 		cop.discountPrice AS discountPrice,

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

@@ -1129,6 +1129,8 @@
                  LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
                  LEFT JOIN shop s ON s.shopID = a.shopID
                  LEFT JOIN club c ON c.userID = a.userID
+                 LEFT JOIN cm_order_product cop ON a.shopOrderID = cop.shopOrderID
+                 LEFT JOIN product p ON cop.productID = p.productID
         WHERE co.organizeID = 0
           AND co.refundType != 2
           AND co.delFlag = 0
@@ -1142,6 +1144,7 @@
           AND cror.mbOrderId IS NOT NULL
           AND cror.splitStatus = 0
           AND a.receiptStatus=3
+          AND p.splitCode != 'E1807480235'
           AND co.orderID NOT IN (
             SELECT orderID
             FROM cm_order_product
@@ -1269,6 +1272,8 @@
         LEFT JOIN cm_split_account csa on csa.shopOrderId = a.shopOrderID
         LEFT JOIN shop s ON s.shopID = a.shopID
         LEFT JOIN club c ON c.userID = a.userID
+        LEFT JOIN cm_order_product cop ON a.shopOrderID = cop.shopOrderID
+        LEFT JOIN product p ON cop.productID = p.productID
         WHERE co.organizeID = 0
           AND co.refundType != 2
           AND co.delFlag = 0
@@ -1283,6 +1288,7 @@
           AND cror.delFlag = 0
           AND cror.mbOrderId IS NOT NULL
           AND cror.splitStatus = 1
+          AND p.splitCode != 'E1807480235'
         <if test="startTime != null and startTime != ''">
             AND (a.orderTime &gt; #{startTime} OR a.orderTime = #{startTime})
         </if>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -324,11 +324,33 @@
                 <b>退款方式：</b>
                 <c:if test="${order.receiptStatus eq 1}">无支付无退款</c:if>
                 <c:if test="${order.receiptStatus ne 1}">
-                    <c:if test="${returnOnline}">
-                        <input class="check-item-review refundOnlineFee" type="radio" checked name="returnedWay" value='2'/>
-                        线上退回
+                    <c:if test="${order.produtCode ne 1}">
+                        <c:if test="${returnOnline}">
+                            <input class="check-item-review refundOnlineFee" type="radio" checked name="returnedWay" value='2'/>
+                            线上退回
+                        </c:if>
+                        <c:if test="${!returnOnline}">
+                            <c:if test="${cmReturnedPurchase.refundOfflineFee>0}">
+                                <input class="check-item-review refundOfflineFee" checked type="checkbox" onclick="showBankInfo()"/>
+                            </c:if>
+                            <c:if test="${empty cmReturnedPurchase.refundOfflineFee or cmReturnedPurchase.refundOfflineFee eq 0}">
+                                <input class="check-item-review refundOfflineFee" type="checkbox" onclick="showBankInfo()"/>
+                            </c:if>
+                            线下转账
+                            <from:input path="refundOfflineFee" onkeyup="num(this)"   placeholder="￥0.00" value="${empty cmReturnedPurchase.refundOfflineFee?'':(cmReturnedPurchase.refundOfflineFee)}"></from:input>
+                            <c:if test="${order.rechargeGoods ne 1 && order.rechargeGoods ne 2}">
+                                <c:if test="${cmReturnedPurchase.refundBalanceFee>0}">
+                                    <input class="check-item-review refundBalanceFee" checked type="checkbox"/>
+                                </c:if>
+                                <c:if test="${empty cmReturnedPurchase.refundBalanceFee or cmReturnedPurchase.refundBalanceFee eq 0}">
+                                    <input class="check-item-review refundBalanceFee" type="checkbox"/>
+                                </c:if>
+                                账户余额
+                                <from:input path="refundBalanceFee" onkeyup="num(this)" placeholder="￥0.00" value="${empty cmReturnedPurchase.refundBalanceFee?'':(cmReturnedPurchase.refundBalanceFee)}"></from:input>
+                            </c:if>
+                        </c:if>
                     </c:if>
-                    <c:if test="${!returnOnline}">
+                    <c:if test="${order.produtCode eq 1}">
                         <c:if test="${cmReturnedPurchase.refundOfflineFee>0}">
                             <input class="check-item-review refundOfflineFee" checked type="checkbox" onclick="showBankInfo()"/>
                         </c:if>

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

@@ -576,6 +576,13 @@
             <c:if test="${order.receiptStatus == 3 && order.confirmType != null && order.confirmType != ''}">
                 <%--                <span style='color:#FF0000'>（已抹平收款）</span>--%>
             </c:if>
+            <c:forEach items="${order.newShopOrders}" var="on" varStatus="index">
+                <c:forEach items="${on.newOrderProducts}" var="op" varStatus="index">
+                    <c:if test="${op.splitCode eq 'E1807480235'}">
+                        <font color="red">(采美信息线上收款)</font>
+                    </c:if>
+                </c:forEach>
+            </c:forEach>
         </td>
         <td>
             退款金额（已完成）：<fmt:formatNumber value="${returnValue}" type="currency"/>