Merge remote-tracking branch 'origin/developerD' into developer

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 productCode;//订单商品是否是采美信息分帐号收款的线上支付子订单
+
 
     /**
      * 呵呵商城优惠券
@@ -1202,5 +1204,13 @@ public class NewOrder extends DataEntity<NewOrder> {
     public void setNewOrderProducts(List<NewOrderProduct> newOrderProducts) {
         this.newOrderProducts = newOrderProducts;
     }
+
+    public Integer getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(Integer productCode) {
+        this.productCode = productCode;
+    }
 }
 

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

@@ -1392,6 +1392,8 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     CmReturnedPurchaseProduct bean = new CmReturnedPurchaseProduct();
                     bean.setShopOrderID(shopOrder.getShopOrderID());
                     List<CmReturnedPurchaseProduct> cmReturnedPurchaseProductList = cmReturnedPurchaseProductDao.getCmReturnedPurchaseProductList(bean);
+                    // 商品是否含税判断
+                    int item = 0;
                     //获取订单商品
                     List<NewOrderProduct> list = newOrderProductDao.findListByShopOrderID(shopOrder.getShopOrderID());
                     if (CollectionUtils.isNotEmpty(list)) {
@@ -1405,6 +1407,14 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                             if (null == newOrderProduct.getCancelProductNum()) {
                                 newOrderProduct.setCancelProductNum(0);
                             }
+                            // 判断商品是否是采美信息分帐号收款
+                            if ("E1807059160".equals(newOrderProduct.getSplitCode())) {
+                                item = 1;
+                                newOrder.setProductCode(1);
+                            }
+                            if (item != 1){
+                                newOrder.setProductCode(2);
+                            }
                             for (CmReturnedPurchaseProduct cmReturnedPurchaseProduct : cmReturnedPurchaseProductList) {
                                 Boolean isFirstReturn = false;
                                 if (newOrderProduct.getShopOrderID().equals(cmReturnedPurchaseProduct.getShopOrderID())

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

@@ -3,6 +3,7 @@ package com.caimei.modules.order.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.caimei.modules.order.dao.NewOrderDao;
+import com.caimei.modules.order.dao.NewShopOrderDao;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.utils.Disguiser;
 import com.caimei.redis.RedisService;
@@ -35,6 +36,8 @@ public class SplitAccountService extends BaseService {
     private NewOrderDao newOrderDao;
     @Resource
     private RedisService redisService;
+    @Resource
+    private NewShopOrderDao newShopOrderDao;
 
     @Transactional(readOnly = false,rollbackFor = Exception.class)
     public void SplitAccount() {
@@ -155,9 +158,10 @@ public class SplitAccountService extends BaseService {
                                 newOrderDao.insertPayShopRecord(shopRecord);
                             }
                             // 子订单是否全部付款
+                            List<String> payStatus = newShopOrderDao.findPayStatusByOrderID(orderRelation.getOrderId());
                             boolean isPay = true;
-                            for (ShopOrderVo shops : shopOrderList) {
-                                if (3 != shops.getPayStatus()) {
+                            for (String shops : payStatus) {
+                                if (!"3".equals(shops)) {
                                     isPay = false;
                                     break;
                                 }

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

@@ -1015,6 +1015,8 @@
         LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
         LEFT JOIN cm_order co ON cror.orderID = co.orderID
         left join cm_shop_order cso on cso.orderId = cror.orderID
+        LEFT JOIN cm_order_product cop ON co.shopOrderIDs = cop.shopOrderID
+        LEFT JOIN product p ON cop.productID = p.productID
         WHERE cror.relationType = 2
           AND cso.receiptStatus=3
           AND cror.delFlag = 0
@@ -1025,6 +1027,7 @@
           AND co.organizeID = 0
           AND co.orderType != 2
           AND co.refundType != 2
+#           AND p.splitCode != 'E1807059160'
     </select>
 
     <select id="getOnlineBalance" resultType="com.caimei.modules.order.entity.OrderReceiptRelationPo">

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

@@ -32,7 +32,6 @@
 		  a.`num` AS `num`,
 		  a.`presentNum` AS `presentNum`,
 		  a.`outStoreType` AS `outStoreType`,
-		  a.`skuID` AS `skuID`,
 		  a.`productNo` AS `productNo`,
 		  a.`price` AS `price`,
 		  a.`normalPrice` AS `normalPrice`,
@@ -92,7 +91,8 @@
           a.svipPriceFlag,
 		  a.svipPriceType,
 		  a.svipDiscount,
-		  a.svipReduction
+		  a.svipReduction,
+		  p.splitCode
 	</sql>
 
     <sql id="orderProductJoins">
@@ -565,6 +565,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 != 'E1807059160'
           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 != 'E1807059160'
         <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.productCode 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.productCode 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/newhome/addOtherImage.jsp

@@ -180,6 +180,7 @@
 </form:form>
 
 <script type="text/javascript">
+    var isCheckedAll = false;
     $(document).ready(function () {
         //弹出框去滚动条
         top.$('#jbox-content').css("overflow-y", "hidden");
@@ -247,6 +248,7 @@
     });
 
     function getCheckedItems() {
+        isCheckedAll = 'other'
         var items = {
             "id": $('#id').val(),
             "productId": "",
@@ -261,6 +263,9 @@
         };
         return items;
     }
+    function handleCheckedAll() {
+        return isCheckedAll;
+    }
 
     /**
      * @param obj
@@ -271,4 +276,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/newhome/addProductImage.jsp

@@ -80,7 +80,7 @@
         <c:forEach items="${page.list}" var="item">
             <tr id="${item.productID}" class="itemtr">
                 <th>
-                    <input class="check-item" type="checkbox" name="info" value='${fns:toJson(item)}'/>
+                    <input class="check-item" type="checkbox" name="info" value='${fns:toJson(item)}' onclick="ClickSelect()"/>
                 </th>
                 <td>${item.productID}</td>
                 <td><img src="${item.mainImage}" width="50px" height="50px"></td>
@@ -150,7 +150,7 @@
         var inputIsCheckedAll = $('.check-all').attr('checked');
         var imageArray = [];
         if(inputIsCheckedAll){
-            isCheckedAll = true;
+            isCheckedAll = 'true';
             $(".check-item").attr('checked', true);
             $(".check-item").each(function (index,el) {
                 var item = $(this).val();
@@ -177,12 +177,44 @@
                 imageArray.push(items);
             })
         }else{
-            isCheckedAll = false;
+            isCheckedAll = 'false';
             $(".check-item").attr('checked', false);
             imageArray = [];
         }
         return imageArray;
     }
+    function ClickSelect(){
+        isCheckedAll = 'checkedData';
+        $(".check-all").attr('checked', false);
+        var imageArray = [];
+        $(".check-item:checked").each(function (index,el) {
+            // console.log('*****');
+            var item = $(this).val();
+            var product = JSON.parse(item);
+            var link ='';
+            if (${productCategory eq 1}) {
+                link = "${fns:getConfig('wwwServer')}product-" + product.productID + ".html";
+            } else {
+                link = "${fns:getConfig('wwwServer')}flea-market-" + product.productID + ".html";
+            }
+            var items = {
+                "id": "",
+                "productId": product.productID,
+                "validFlag": product.validFlag,
+                "image": product.mainImage,
+                "name": product.name,
+                "link": link,
+                "sort": 1,
+                "pcStatus": "1",
+                "appletsStatus": "1",
+                "label": "",
+                "createDate": ""
+            };
+            imageArray.push(items);
+        })
+        // console.log(imageArray);
+        return imageArray;
+    }
     function handleCheckedAll() {
         return isCheckedAll;
     }

src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorContentForm.jsp

@@ -513,12 +513,20 @@
                 var $jboxFrame = top.$('#jbox-iframe');
                 var $mainFrame = top.$('#mainFrame');
                 var $isCheckedAll = $jboxFrame[0].contentWindow.handleCheckedAll();
-                if($isCheckedAll){
+                console.log($isCheckedAll);
+                console.log('checkedData'.indexOf($isCheckedAll) != -1);
+                if('true'.indexOf($isCheckedAll) != -1){
                     var checkedAllList = $jboxFrame[0].contentWindow.handleClickAllSelect();
                     imageList = imageList.concat(checkedAllList);
                     $('#contentTable').show();
                     $("#del").removeAttr("disabled");
                     batchSaveSort();
+                }else if ('checkedData'.indexOf($isCheckedAll) != -1) {
+                    var checkedAllList = $jboxFrame[0].contentWindow.ClickSelect();
+                    imageList = imageList.concat(checkedAllList);
+                    $('#contentTable').show();
+                    $("#del").removeAttr("disabled");
+                    batchSaveSort();
                 }else{
                     if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
                         var items = $jboxFrame[0].contentWindow.getCheckedItems();

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

@@ -379,7 +379,7 @@
                                 已付款
                             </c:if>
                             <c:if test="${s.paying ne '1' && s.payStatus ne '3' }">
-                                <input type="checkbox" ${s.status eq 7 || s.onlineFlag>0 ?'disabled':''}
+                                <input type="checkbox" ${s.status eq 7 || (s.onlineFlag>0 && s.splitCode ne 'E1807059160') ?'disabled':''}
                                        data-shoporderid="${s.shopOrderID}" data-shopid="${s.shopID}" data-isPayShopOtherFee="${s.payShopOtherFee}"/>
                             </c:if>
                         </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 'E1807059160'}">
+                        <font color="red">(采美信息线上收款)</font>
+                    </c:if>
+                </c:forEach>
+            </c:forEach>
         </td>
         <td>
             退款金额（已完成）：<fmt:formatNumber value="${returnValue}" type="currency"/>