bugfix

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

@@ -1656,7 +1656,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             NewShopOrder shopOrder = newShopOrderDao.get(entry.getKey() + "");
             Integer outStoreNum = shopOrder.getOutStoreNum();
             if (null == outStoreNum) {
-                outStoreNum = 0;
+                outStoreNum = shopOrder.getItemCount();
             }
             int num = entry.getValue().stream().mapToInt(NewOrderProduct::getThisTimePostNum).sum();
             if (outStoreNum + num > (shopOrder.getItemCount() + shopOrder.getPresentNum())) {

src/main/java/com/caimei/modules/user/entity/CmRemaks.java

@@ -1,44 +0,0 @@
-package com.caimei.modules.user.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2022/5/7
- */
-public class CmRemaks extends DataEntity<CmRemaks> {
-
-    private Integer remarksId;
-
-    private String remarks;
-
-    private String addTime;
-
-    public Integer getRemarksId() {
-        return remarksId;
-    }
-
-    public void setRemarksId(Integer remarksId) {
-        this.remarksId = remarksId;
-    }
-
-    @Override
-    public String getRemarks() {
-        return remarks;
-    }
-
-    @Override
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public String getAddTime() {
-        return addTime;
-    }
-
-    public void setAddTime(String addTime) {
-        this.addTime = addTime;
-    }
-}

src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp

@@ -66,7 +66,7 @@
     <li class="active"><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
     <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
     <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
-    <li><a href="${ctx}/new/user/agency/cmrenaks">关键词库</a></li>
+<%--    <li><a href="${ctx}/new/user/agency/cmrenaks">关键词库</a></li>--%>
 </ul>
 <br/>
 <form:form id="searchForm" modelAttribute="cmClubRemarks" action="${ctx}/new/user/agency/regist" method="post"