Merge remote-tracking branch 'origin/developerA' into developerA

# Conflicts:
#	src/main/webapp/WEB-INF/views/modules/order/shopOrderDetail.jsp

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

@@ -195,4 +195,6 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
     public int updateDelCmShopOrderByShopOrderIDs(@Param("shopOrderIDs") String[] shopOrderIDs,@Param("delFlag") Integer delFlag);
 
     List<NewShopOrder> getShopOrderlist(NewShopOrder newShopOrder);
+
+    void updateStatus(NewShopOrder shopOrder);
 }

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

@@ -18,6 +18,7 @@ import java.util.List;
 @Data
 public class NewShopOrder extends DataEntity<NewShopOrder> {
 
+    private String closeReason;
     private Integer orderSeen;
     private OrderInvoice orderInvoice;
     private Integer clauseID;

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

@@ -968,6 +968,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         newOrderDao.insertShortLink(markId, shortLink, url);
         return shortLink;
     }
+
     @Transactional(readOnly = false)
     public boolean getSendSms(int markId, String mobile, String content) throws Exception {
         String config = Global.getConfig("cm.config");
@@ -1456,8 +1457,8 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                      */
                     if ((1161 != shopOrder.getShopID() && 2 != shopOrder.getOrderType() && !flag &&
                             (!"E1807059160".equals(shopOrder.getSplitCode()) && null != discernPayWay && 1 != discernPayWay))) {
-                                // 订单下线收款， 付款状态与收款状态同步显示
-                                shopOrder.setPayStatus(shopOrder.getReceiptStatus());
+                        // 订单下线收款， 付款状态与收款状态同步显示
+                        shopOrder.setPayStatus(shopOrder.getReceiptStatus());
                     }
                     // 订单已收款才会出现抹平或者多收退余额，（已收再退款或者撤销退款订单即使存在抹平也需要当未抹平重新计算付款）
                     String receiptStatus = shopOrder.getReceiptStatus();
@@ -1774,25 +1775,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             int userBeans = user.getUserBeans() + order.getUserBeans();
             cmUserDao.updateUserBeans(order.getUserID(), userBeans);
         }
-
-//        if (order.getPayTotalFee() != null && order.getPayTotalFee() < 1000) {
-//            //查本单是否扣豆子，有就返回
-//            UserBeansHistory bean = newCmClubDao.findLowOrder(order.getOrderID());
-//            if (bean != null) {
-//                //有扣豆子记录
-//                UserBeansHistory beansHistory = new UserBeansHistory();
-//                beansHistory.setUserId(order.getUserID());
-//                beansHistory.setOrderId(order.getOrderID());
-//                beansHistory.setBeansType(16);
-//                beansHistory.setType(1);
-//                beansHistory.setNum(500);
-//                beansHistory.setPushStatus(0);
-//                beansHistory.setAddTime(new Date());
-//                newCmClubDao.insertBeansHistory(beansHistory);
-//                int beans = cmUserDao.findUserBeans(order.getUserID()) + 500;
-//                cmUserDao.updateUserBeans(order.getUserID(), beans);
-//            }
-//        }
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String current = dateFormat.format(new Date());
         MessageCenter messageCenter = new MessageCenter();
@@ -1853,6 +1835,30 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         cmUserDao.updateMoney(user);
     }
 
+    @Transactional(readOnly = false)
+    public void setShopOrderBalance(CmUser user, Double amount, NewShopOrder order) {
+        if (UserType.isMaker(Integer.parseInt(user.getRegisterUserTypeID()))) {
+            return;
+        }
+        //0待确认
+        Integer status = order.getStatus();
+        logger.info("----------------------->原余额：" + user.getUserMoney() + "==原可用余额：" + user.getAbleUserMoney());
+        //减操作不更新可用余额
+        if (amount < 0d) {
+            if (!"0".equals(status)) {//待确认状态不需要修改余额，因为本身存在冻结余额不需要重复退回
+                user.setUserMoney(user.getUserMoney() + amount);
+            }
+        } else {
+            if (!"0".equals(status)) {//待确认状态不需要修改余额，因为本身存在冻结余额不需要重复退回
+                user.setUserMoney(user.getUserMoney() + amount);
+            }
+            user.setAbleUserMoney(user.getAbleUserMoney() + amount);
+        }
+        logger.info("----------------------->设置余额：" + amount);
+        logger.info("----------------------->当前余额：" + user.getUserMoney() + "==当前可用余额：" + user.getAbleUserMoney());
+        cmUserDao.updateMoney(user);
+    }
+
     /**
      * 发货
      *
@@ -2887,4 +2893,66 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         }
         return null;
     }
+
+    public void cancelShopOrder(NewShopOrder shopOrder) {
+        //余额退回原账户
+        CmUser user = cmUserDao.get(shopOrder.getUserID().toString());
+        if (shopOrder.getAccountAmount() > 0) {
+            setShopOrderBalance(user, shopOrder.getAccountAmount(), shopOrder);
+            //取消收支记录
+            CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
+            cmUserBalanceRecord.setUserId(shopOrder.getUserID());
+            cmUserBalanceRecord.setOrderId(shopOrder.getOrderID());
+            cmUserBalanceRecord.setRemark("取消订单，余额记录无效-后台");
+            cmUserBalanceRecord.setDelFlag("1");
+            cmUserBalanceRecordService.updateBalanceRecord(cmUserBalanceRecord);
+        }
+        shopOrder.setStatus(4);//订单状态变成交易关闭 6
+        shopOrder.setCloseReason("后台手动关闭");//   订单取消原因
+        newShopOrderDao.updateStatus(shopOrder);
+
+        //todo 采美豆退回,当前版本采美豆暂时无效，先不处理
+//        if (shopOrder.getUserBeans() != null && order.getUserBeans() > 0) {
+//            UserBeansHistory beansHistory = new UserBeansHistory();
+//            beansHistory.setUserId(order.getUserID());
+//            beansHistory.setOrderId(order.getOrderID());
+//            beansHistory.setBeansType(9);
+//            beansHistory.setType(1);
+//            beansHistory.setNum(order.getUserBeans());
+//            beansHistory.setPushStatus(0);
+//            beansHistory.setAddTime(new Date());
+//            newCmClubDao.insertBeansHistory(beansHistory);
+//            int userBeans = user.getUserBeans() + order.getUserBeans();
+//            cmUserDao.updateUserBeans(order.getUserID(), userBeans);
+//        }
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String current = dateFormat.format(new Date());
+        MessageCenter messageCenter = new MessageCenter();
+        messageCenter.setShopId(null);
+        messageCenter.setClubId(shopOrder.getClubID());
+        messageCenter.setUserType(1);
+        messageCenter.setMessageType(1);
+        messageCenter.setOrderMessageType(4);
+        messageCenter.setContent("您的订单已成功取消！");
+        messageCenter.setOrderId(shopOrder.getOrderID());
+        messageCenter.setTime(current);
+        messageCenterDao.addMessageCenter(messageCenter);
+
+        //优惠券退回
+        if (shopOrder.getCouponAmount() > 0 && 0 != shopOrder.getStatus()) {
+            CmCouponOrderRecord couponRecord = newOrderDao.findOrderCouponRecord(shopOrder.getOrderID());
+            if (couponRecord != null) {
+                CmCouponClub couponClub = cmCouponClubDao.get(couponRecord.getClubCouponId().toString());
+                couponClub.setOrderId(null);
+                couponClub.setReturnedId(0);
+                couponClub.setSource("3");
+                couponClub.setStatus("1");
+                couponClub.setCreateDate(new Date());
+                couponClub.setUseDate(null);
+                couponClub.setDelFlag("0");
+                cmCouponClubDao.insert(couponClub);
+            }
+        }
+    }
+
 }

src/main/java/com/caimei/modules/order/web/CmShopOrderController.java

@@ -8,11 +8,11 @@ import com.caimei.modules.order.dao.CmPayShopRecordDao;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.CmChangePayShopProductService;
 import com.caimei.modules.order.service.CmChangePayShopRecondService;
+import com.caimei.modules.order.service.CmOrderRemarkService;
 import com.caimei.modules.order.service.NewShopOrderService;
 import com.caimei.modules.user.entity.CmUserOrganize;
 import com.caimei.modules.user.service.CmUserOrganizeService;
 import com.caimei.utils.MathUtil;
-import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
@@ -56,6 +56,8 @@ public class CmShopOrderController extends BaseController {
     private BpClauseService bpClauseService;
     @Resource
     private OrderInvoiceDao orderInvoiceDao;
+    @Resource
+    private CmOrderRemarkService cmOrderRemarkService;
 
     @ModelAttribute
     public NewShopOrder get(@RequestParam(required = false) String id) {
@@ -82,6 +84,19 @@ public class CmShopOrderController extends BaseController {
         if (null != orderInvoice) {
             newShopOrder.setOrderInvoice(orderInvoice);
         }
+        CmOrderRemark cmOrderRemark = new CmOrderRemark();
+        cmOrderRemark.setShopOrderID(newShopOrder.getShopOrderID());
+        List<CmOrderRemark> remarksList = cmOrderRemarkService.findList(cmOrderRemark);
+        if (!org.springframework.util.CollectionUtils.isEmpty(remarksList)) {
+            for (CmOrderRemark cor : remarksList) {
+                String id = cor.getId();
+                List<CmOrderRemarkImage> remarkImgList = cmOrderRemarkService.findRemarkImgList(id);
+                cor.setCmOrderRemarkImageList(remarkImgList);
+                List<CmOrderRemarkFile> remarkFileList = cmOrderRemarkService.findRemarkFile(id);
+                cor.setRemarkFileList(remarkFileList);
+            }
+        }
+        model.addAttribute("remarksList", remarksList);
         return "modules/order/shopOrderDetail";
     }
 

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -746,6 +746,20 @@ public class NewOrderController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/order/detail/?id=" + orderID;
     }
 
+    @RequiresPermissions("order:order:edit")
+    @RequestMapping("cancelShopOrder")
+    public String cancelShopOrder(Integer shopOrderId, RedirectAttributes redirectAttributes) {
+        NewShopOrder shopOrder = newShopOrderDao.get(shopOrderId.toString());
+        boolean cancelFlag = (null != shopOrder && (0 == shopOrder.getStatus() || (1 == shopOrder.getStatus() && "1".equals(shopOrder.getReceiptStatus()))));
+        if (!cancelFlag) {
+            // 非待确认(或待收待发)订单
+            addMessage(redirectAttributes, "订单状态不符");
+            return "redirect:" + Global.getAdminPath() + "/shopOrder/detail/?id=" + shopOrderId;
+        }
+        newOrderService.cancelShopOrder(shopOrder);
+        addMessage(redirectAttributes, "取消订单成功");
+        return "redirect:" + Global.getAdminPath() + "/shopOrder/detail/?id=" + shopOrderId;
+    }
 
     /**
      * 确认收货

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

@@ -2775,6 +2775,14 @@
         </foreach>
     </update>
 
+    <update id="updateStatus">
+        UPDATE cm_shop_order
+        SET shopStatus      = #{status},
+            closeTime   = NOW(),
+            closeReason = #{closeReason}
+        WHERE shopOrderID = #{shopOrderID}
+    </update>
+
     <delete id="delCmShopOrderByShopOrderID" parameterType="String">
         delete
         from cm_shop_order

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

@@ -117,17 +117,17 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-		<c:if test="${source eq 1 or empty source}">
-            <c:if test="${orderType eq 2}">
-                <li><a href="${ctx}/hehe/new/order/orderList">订单列表</a></li>
-            </c:if>
-            <c:if test="${orderType ne 2}">
-                <li><a href="${ctx}/order/orderList">订单列表</a></li>
-            </c:if>
-		</c:if>
-		<c:if test="${source eq 2}">
-			<li><a href="${ctx}/order/detail?id=${orderID}">订单详情</a></li>
-		</c:if>
+<%--		<c:if test="${source eq 1 or empty source}">--%>
+<%--            <c:if test="${orderType eq 2}">--%>
+<%--                <li><a href="${ctx}/hehe/new/order/orderList">订单列表</a></li>--%>
+<%--            </c:if>--%>
+<%--            <c:if test="${orderType ne 2}">--%>
+<%--                <li><a href="${ctx}/order/orderList">订单列表</a></li>--%>
+<%--            </c:if>--%>
+<%--		</c:if>--%>
+<%--		<c:if test="${source eq 2}">--%>
+<%--			<li><a href="${ctx}/order/detail?id=${orderID}">订单详情</a></li>--%>
+<%--		</c:if>--%>
 		<li><a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${orderID}&source=${source}&orderType=${orderType}">订单备注</a></li>
 		<li  class="active"><a href="${ctx}/order/cmOrderRemark/toAddRemarksViewNew.rpc?orderID=${orderID}&source=${source}&orderType=${orderType}">添加订单备注</a></li>
 	</ul><br/>

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

@@ -27,17 +27,17 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<c:if test="${source eq 1 or empty source}">
-			<c:if test="${orderType eq 2}">
-				<li><a href="${ctx}/hehe/new/order/orderList">订单列表</a></li>
-			</c:if>
-			<c:if test="${orderType ne 2}">
-				<li><a href="${ctx}/order/orderList">订单列表</a></li>
-			</c:if>
-		</c:if>
-		<c:if test="${source eq 2}">
-			<li><a href="${ctx}${orderType == 2 ?'/hehe/new':''}/order/detail?id=${orderID}">订单详情</a></li>
-		</c:if>
+<%--		<c:if test="${source eq 1 or empty source}">--%>
+<%--			<c:if test="${orderType eq 2}">--%>
+<%--				<li><a href="${ctx}/hehe/new/order/orderList">订单列表</a></li>--%>
+<%--			</c:if>--%>
+<%--			<c:if test="${orderType ne 2}">--%>
+<%--				<li><a href="${ctx}/order/orderList">订单列表</a></li>--%>
+<%--			</c:if>--%>
+<%--		</c:if>--%>
+<%--		<c:if test="${source eq 2}">--%>
+<%--			<li><a href="${ctx}${orderType == 2 ?'/hehe/new':''}/order/detail?id=${orderID}">订单详情</a></li>--%>
+<%--		</c:if>--%>
 		<li class="active"><a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${orderID}&source=${source}&orderType=${orderType}">订单备注</a></li>
 		<li><a href="${ctx}/order/cmOrderRemark/toAddRemarksViewNew.rpc?orderID=${orderID}&shopOrderID=${shopOrderID}&source=${source}&orderType=${orderType}">添加订单备注</a></li>
 	</ul><br/>

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

@@ -256,7 +256,7 @@
                                        value="${product.cmCostPrice}"/></td>
                             <td width="20%">
                                 <c:choose>
-                                    <c:when test="${product.includedTax ne '' and product.includedTax eq 0 and product.invoiceType ne 1 and product.invoiceType ne 2}">
+                                    <c:when test="${product.includedTax ne '' and ((product.includedTax eq 0 and product.invoiceType ne 1 and product.invoiceType ne 2) or product.includedTax eq 1 )}">
                                         <label style="text-align: center">-----</label>
                                     </c:when>
                                     <c:otherwise>

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

@@ -139,7 +139,11 @@
                         <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}">发货记录</a>
                         <a href="${ctx}/bulkpurchase/cmRefundsProduct/toShopOrderRefundRecord.rpc?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}&from=2">收付款记录</a>
                         <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByShopOrder.rpc?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}">退款（退货）记录</a>
-                        <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2&shopOrderID=${order.shopOrderID}">订单备注</a>
+                        <c:if test="${order.status == 0}">
+                            <a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"
+                               onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
+                        </c:if>
+<%--                        <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2&shopOrderID=${order.shopOrderID}">订单备注</a>--%>
                     </shiro:hasPermission>
                 </div>
             </div>
@@ -149,7 +153,77 @@
 
 </table>
 <textarea id="copyValue" style="display: none"></textarea>
-
+<div class="remarks">
+    <div class="remarkButton">
+        订单备注
+        <a onclick="hideRemarks();">收起</a>
+    </div>
+    <button id="addButton" class="btn btn-primary" onclick="">
+        添加备注
+        <%--        <a class="jumpRemark"--%>
+        <%--           href="${ctx}/order/cmOrderRemark/toAddRemarksViewNew.rpc?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}&orderType=${order.orderType}">添加备注</a>--%>
+    </button>
+    <c:if test="${not empty remarksList}">
+        <div style="overflow-x: hidden;word-break:break-all">
+            <c:forEach items="${remarksList}" var="list" varStatus="remark">
+                <div class="td clear">
+                    <div style="font-weight: bold;width: 100%;float: left;">
+                        <span style="float: left;">${list.sysUserName}[${list.no}]</span>
+                        <span style="float: left;margin-left:10px;"><fmt:formatDate value="${list.createDate}"
+                                                                                    pattern="yyyy-MM-dd HH:mm"/></span>
+                    </div>
+                    <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                            备注内容:
+                        </div>
+                        <div style="width: 1000px;float: left;margin: 10px 0;">
+                                ${list.remarks}
+                        </div>
+                    </div>
+                    <div class="td-text"
+                         style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">
+                        <c:if test="${not empty list.cmOrderRemarkImageList}">
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                图片:
+                            </div>
+                            <div style="width: 1000px;float: left;">
+                                <c:forEach items="${list.cmOrderRemarkImageList}" var="remarkImageList"
+                                           varStatus="remarkImage">
+                                    <a href="${remarkImageList.remarkImage}" target="_blank">
+                                        <img class="enlarge-pic" style="height: 150px;width: 150px;margin-top: 10px"
+                                             src="${remarkImageList.remarkImage}">&nbsp;
+                                    </a>
+                                </c:forEach>
+                            </div>
+                        </c:if>
+                    </div>
+                    <div class="td-text"
+                         style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">
+                        <c:if test="${not empty list.remarkFileList}">
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                文件:
+                            </div>
+                            <div style="width: 1000px;float: left;margin: 10px 0;">
+                                <c:forEach items="${list.remarkFileList}" var="item" varStatus="remarkFile">
+                                    <p>${item.name}&nbsp;&nbsp;&nbsp;&nbsp;<a
+                                            href="${ctx}/order/cmOrderRemark/downFile?fileId=${item.id}">下载</a></p>
+                                </c:forEach>
+                            </div>
+                        </c:if>
+                    </div>
+                </div>
+            </c:forEach>
+        </div>
+    </c:if>
+    <c:if test="${empty remarksList}">
+        <font size="3" style="text-align: center;display: block;line-height: 80px;" color="#0066CC">暂无备注信息,有需要请您前往添加订单备注。</font>
+    </c:if>
+</div>
+<div class="remarkShow">
+    订单备注
+<%--    <a onclick="showRemark();">展开</a>--%>
+    <a onclick="openRemarks(${order.orderID},${order.shopOrderID})">展开</a>
+</div>
 <div class="order-rows">
     <tr>
         <span><label>子订单状态：</label>${fns:getDictLabel(order.status,"shopStatus","" )}</span>
@@ -459,38 +533,38 @@
 <c:if test="${order.organizeID != 4}">
     <div class="order-rows">
         <label>订单对机构是否可见：</label>
-                    <c:if test="${order.orderSeen eq 1}">
-                        <label>可见</label>
-                    </c:if>
-                    <c:if test="${order.orderSeen eq 2}">
-                        <label>不可见</label>
-                    </c:if>
-                    <c:if test="${order.orderSeen ne 1 and order.orderSeen ne 2}">
-                        <label>未定义</label>
-                    </c:if>
+        <c:if test="${order.orderSeen eq 1}">
+            <label>可见</label>
+        </c:if>
+        <c:if test="${order.orderSeen eq 2}">
+            <label>不可见</label>
+        </c:if>
+        <c:if test="${order.orderSeen ne 1 and order.orderSeen ne 2}">
+            <label>未定义</label>
+        </c:if>
     </div>
 </c:if>
 <div class="order-rows">
     <label>发票信息：</label>
-        <c:if test="${order.orderInvoice.type eq 0}">
-            <%--            <input name="invoice" type="radio" checked="checked">--%>
-            <label>不需要发票</label>
-        </c:if>
-        <c:if test="${order.orderInvoice.type eq 1}">
-            <%--            <input name="invoice" type="radio" checked="checked">--%>
-            <label>增值税普通发票</label>
-        </c:if>
-        <c:if test="${order.orderInvoice.type eq 2}">
-            <%--            <input name="invoice" type="radio" checked="checked">--%>
-            <label>增值税专用发票</label>
-        </c:if>
-        <c:if test="${order.orderInvoice.type eq null}">
-            <%--            <input name="invoice" type="radio" checked="checked">--%>
-            <label>不需要发票</label>
-        </c:if>
-        <c:if test="${order.orderInvoice.type == 1}">
-            <br>
-            <div>
+    <c:if test="${order.orderInvoice.type eq 0}">
+        <%--            <input name="invoice" type="radio" checked="checked">--%>
+        <label>不需要发票</label>
+    </c:if>
+    <c:if test="${order.orderInvoice.type eq 1}">
+        <%--            <input name="invoice" type="radio" checked="checked">--%>
+        <label>增值税普通发票</label>
+    </c:if>
+    <c:if test="${order.orderInvoice.type eq 2}">
+        <%--            <input name="invoice" type="radio" checked="checked">--%>
+        <label>增值税专用发票</label>
+    </c:if>
+    <c:if test="${order.orderInvoice.type eq null}">
+        <%--            <input name="invoice" type="radio" checked="checked">--%>
+        <label>不需要发票</label>
+    </c:if>
+    <c:if test="${order.orderInvoice.type == 1}">
+        <br>
+        <div>
                     <span>
                         <c:if test="${order.orderInvoice.invoiceTitleType eq 0}">
                             个人抬头：
@@ -504,154 +578,63 @@
                             <span>${order.orderInvoice.corporationTaxNum}</span>
                         </c:if>
                     </span>
-            </div>
-        </c:if>
-        <c:if test="${order.orderInvoice.type == 2}">
-            <table>
-                <tr>
-                    <td><span>单位名称：${order.orderInvoice.invoiceTitle}</span></td>
-                    <td><span>纳税人识别号：${order.orderInvoice.corporationTaxNum}</span></td>
-                    <td><span>注册地址：${order.orderInvoice.registeredAddress}</span></td>
-                </tr>
-                <tr>
-                    <td><span>注册电话：${order.orderInvoice.registeredPhone}</span></td>
-                    <td><span>开户银行：${order.orderInvoice.openBank}</span></td>
-                    <td><span>银行账号：${order.orderInvoice.bankAccountNo}</span></td>
-                </tr>
-            </table>
-        </c:if>
+        </div>
+    </c:if>
+    <c:if test="${order.orderInvoice.type == 2}">
+        <table>
+            <tr>
+                <td><span>单位名称：${order.orderInvoice.invoiceTitle}</span></td>
+                <td><span>纳税人识别号：${order.orderInvoice.corporationTaxNum}</span></td>
+                <td><span>注册地址：${order.orderInvoice.registeredAddress}</span></td>
+            </tr>
+            <tr>
+                <td><span>注册电话：${order.orderInvoice.registeredPhone}</span></td>
+                <td><span>开户银行：${order.orderInvoice.openBank}</span></td>
+                <td><span>银行账号：${order.orderInvoice.bankAccountNo}</span></td>
+            </tr>
+        </table>
+    </c:if>
 </div>
 <c:if test="${order.organizeID != 4}">
     <div class="order-rows">
         <label>售后条款：</label>
-                    <c:forEach items="${bpClauses}" var="items" varStatus="index">
-                        <c:if test="${items.clauseType ne 0  }">
+        <c:forEach items="${bpClauses}" var="items" varStatus="index">
+            <c:if test="${items.clauseType ne 0  }">
                             <span>
                                 <input id="clauseId${index.index+1}" class="clauseId" name="clauseID" type="radio"
                                        value="${items.id}"${(order.clauseID)==(items.id)?'checked="checked"':''}
                                        class="required" class="clauseId" disabled="disabled">
                                 <input type="hidden" class="clauseContent" id="clauseContent${index.index+1}"
                                        value="${fns:escapeHtml(items.content)}">
-                                <input type="hidden" class="clauseName" id="clauseName${index.index+1}" value="${items.name}">
+                                <input type="hidden" class="clauseName" id="clauseName${index.index+1}"
+                                       value="${items.name}">
                                 <a href="javascript:void(0);"
                                    onclick="openClauseInfo(${index.index+1});"><label>${items.name}</label></a>
                             </span>
-                        </c:if>
-                    </c:forEach>
+            </c:if>
+        </c:forEach>
     </div>
 </c:if>
-<%-- 订单备注 --%>
-<div class="remarks-drawer-content">
-    <div class="drawer-btn-main">
-        <p>订单备注</p>
-        <p class="drawer-close">收起》</p>
-        <p class="drawer-opens">展开《</p>
-    </div>
-    <div class="drawer-content">
-        <div class="drawer-content-btn">
-            <input id="btnSubmit" class="btn btn-primary" type="submit" value="添加备注">
-        </div>
-        <div class="drawer-content-none">
-            <p>暂无备注信息,有需要请您前往添加订单备注。</p>
-        </div>
-        <div class="drawer-content-mains">
-            <div class="drawer-list">
-                <div class="drawer-list-title">
-                    <span>赵智捷：2023-07-05 14:59</span>
-                </div>
-                <div class="drawer-list-text">
-                    <span>备注内容：</span>
-                    申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63
-                </div>
-                <div class="drawer-list-title">
-                    <span>图片</span>
-                </div>
-                <div class="drawer-list-image">
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a>
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a>
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a>
-                </div>
-                <div class="drawer-list-title">
-                    <span>文件</span>
-                </div>
-                <div class="drawer-list-file">
-                  <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                  <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                  <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                </div>
-            </div>
-            <div class="drawer-list">
-                <div class="drawer-list-title">
-                    <span>赵智捷：2023-07-05 14:59</span>
-                </div>
-                <div class="drawer-list-text">
-                    <span>备注内容：</span>
-                    申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63
-                </div>
-                <div class="drawer-list-title">
-                    <span>图片</span>
-                </div>
-                <div class="drawer-list-image">
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a>
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a>
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a>
-                </div>
-                <div class="drawer-list-title">
-                    <span>文件</span>
-                </div>
-                <div class="drawer-list-file">
-                  <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                  <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                  <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                </div>
-            </div>
-            <div class="drawer-list">
-                <div class="drawer-list-title">
-                    <span>赵智捷：2023-07-05 14:59</span>
-                </div>
-                <div class="drawer-list-text">
-                    <span>备注内容：</span>
-                    申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63申请付款1260 一盒63
-                </div>
-                <div class="drawer-list-title">
-                    <span>图片</span>
-                </div>
-                <div class="drawer-list-image">
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a>
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a>
-                    <a href="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg">
-                        <img src="https://img.caimei365.com/group1/M00/00/41/rB-lF2LU3D2AODh6AAKqLkQtdyk410.jpg" alt="">
-                    </a>
-                </div>
-                <div class="drawer-list-title">
-                    <span>文件</span>
-                </div>
-                <div class="drawer-list-file">
-                  <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                  <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                  <p>奥斯卡级大叔大叔极度恐慌.pdf</p>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 <script type="text/javascript">
+
+    function openRemarks(orderId, shopOrderId) {
+        top.$.jBox("iframe:${ctx}/order/cmOrderRemark/remarksViewNew?orderID=" + orderId + "&shopOrderID=" + shopOrderId, {
+            iframeScrolling: 'yes',
+            top: 100,
+            width: 1200,
+            height: 800,
+            persistent: true,
+            title: "订单备注",
+            buttons: {"收起": '-1'},
+            submit: function (v, h, f) {
+                //确定
+                var $jboxFrame = top.$('#jbox-iframe');
+                var $mainFrame = top.$('#mainFrame');
+                return true;
+            }, closed: function () {/* 窗口关闭后执行的函数 */}
+        });
+    }
+
     (function () {
 
         $('.clauseId').each(function () {
@@ -672,21 +655,6 @@
                 self.remove();
             }
         })
-        // 备注抽屉显隐
-        $('.drawer-opens').click(function() {
-            $('.remarks-drawer-content').animate({
-                'right': '0px'
-            }, 300);
-            $(this).hide()
-            $('.drawer-close').show()
-        });
-        $('.drawer-close').click(function() {
-            $('.remarks-drawer-content').animate({
-                'right': '-580px'
-            }, 300);
-            $(this).hide()
-            $('.drawer-opens').show()
-        });
     })();
 
     function operation(shopOrderID) {
@@ -699,6 +667,14 @@
         }
     }
 
+    function showRemark() {
+        $(".remarks").show();
+    }
+
+    function hideRemarks() {
+        $(".remarks").hide();
+    }
+
     function openClauseInfo(index) {
         var content = $("#clauseContent" + index).val();
         if (content == '') {