增加呵呵订单标识

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

@@ -52,7 +52,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private Double freight;             // decimal(20,0) comment '运费' v5.0版本已废弃,运费已使用商品形式存储,
     //    private Integer freePostageTicketID; // bigint(11) comment '包邮券ID',
     private Integer buyUserID;//            下单人
-    private String orderType;//      char(2) comment '订单类型 协销订单0 普通订单1',
+    private String orderType;//    订单类型 0协销订单、 1普通订单、 2呵呵订单
     private List<NewShopOrder> newShopOrders;
     private OrderUserInfo bpOrderUserinfo; //订单用户信息表
     private OrderInvoice orderInvoice;

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

@@ -1,5 +1,6 @@
 package com.caimei.modules.order.service;
 
+import com.caimei.modules.hehe.dao.HeHeNewOrderDao;
 import com.caimei.modules.order.dao.CmDiscernReceiptDao;
 import com.caimei.modules.order.dao.CmRebateRecordDao;
 import com.caimei.modules.order.dao.NewOrderDao;
@@ -45,6 +46,8 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
     private NewCmShopDao newCmShopDao;
     @Resource
     private NewShopOrderDao newShopOrderDao;
+    @Resource
+    private HeHeNewOrderDao heHeNewOrderDao;
 
     public CmDiscernReceipt get(String id) {
         return super.get(id);
@@ -56,7 +59,7 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
 
     public Page<CmDiscernReceipt> findPage(Page<CmDiscernReceipt> page, CmDiscernReceipt cmDiscernReceipt) {
         Page<CmDiscernReceipt> result = super.findPage(page, cmDiscernReceipt);
-        result.getList().stream().forEach(bean -> {
+        result.getList().forEach(bean -> {
             logger.info("-----------------:::::" + bean.getId());
             String type = "";
             String no = "";
@@ -65,12 +68,20 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
                 for (Map<String, Object> map : orderIDs) {
                     if ("".equals(type)) {
 //					协销订单 0 普通订单 1',
-                        Object orderType = map.get("orderType");
+                        Integer orderType = (Integer) map.get("orderType");
                         if (null != map.get("orderType")) {
                             type += map.get("orderType").toString().equals("0") ? "协销" : "自主";
                         } else {
                             type += "自主";
                         }
+                        if (2 == orderType) {
+                            //呵呵商城订单
+                            Integer orderId = (Integer) map.get("orderID");
+                            NewOrder order = newOrderDao.findByOrderID(orderId);
+                            String name = heHeNewOrderDao.findHeUser(order.getUserID());
+                            bean.setName(name);
+                            bean.setReceiptOrderType("2");
+                        }
                     } else {
                         type += ("<br>" + (map.get("orderType").toString().equals("0") ? "协销" : "自主"));
                     }
@@ -100,8 +111,8 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
         ReceiptDetailVo vo = cmDiscernReceiptDao.getInfos(cmDiscernReceipt.getId());
         List<CmReceiptOrderRelation> relations = cmReceiptOrderRelationService.findByReceiptID(cmDiscernReceipt.getId());
         boolean receiptOrderFlag = false;
-        if(CollectionUtils.isNotEmpty(relations) && relations.size() > 1){
-                receiptOrderFlag = true;
+        if (CollectionUtils.isNotEmpty(relations) && relations.size() > 1) {
+            receiptOrderFlag = true;
         }
         vo.setReceiptOrderFlag(receiptOrderFlag);//设置一款多单状态
         List<ReceiptOrderInfoVo> orderInfos = new ArrayList<>(); //一个收款可能会关联了一个或多个订单
@@ -118,9 +129,9 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
             if (roi != null) {
                 List<ReceiptRecordVo> receiptRecordByOrderID = cmDiscernReceiptDao.findReceiptRecordByOrderID(roi);
 //                暂时不启用抹平明细
-                if(CollectionUtils.isNotEmpty(receiptRecordByOrderID)){
-                    for(ReceiptRecordVo v:receiptRecordByOrderID){
-                        if(StringUtils.equals("3",v.getConfirmType())){
+                if (CollectionUtils.isNotEmpty(receiptRecordByOrderID)) {
+                    for (ReceiptRecordVo v : receiptRecordByOrderID) {
+                        if (StringUtils.equals("3", v.getConfirmType())) {
                             String id = v.getReceiptID();
                             double returnBalanceAmount = cmDiscernReceiptDao.getReturnBalanceAmount(id);
                             v.setReturnBalanceAmount(returnBalanceAmount);

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

@@ -2,6 +2,7 @@ package com.caimei.modules.order.service;
 
 import com.caimei.dfs.image.beens.ImageUploadInfo;
 import com.caimei.modules.common.utils.UploadUtils;
+import com.caimei.modules.hehe.dao.HeHeNewOrderDao;
 import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.sys.utils.UploadImageUtils;
@@ -56,6 +57,8 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
     private CmReceiptOrderRelationDao cmReceiptOrderRelationDao;
     @Resource
     private CmRefundShopRecordDao cmRefundShopRecordDao;
+    @Resource
+    private HeHeNewOrderDao heHeNewOrderDao;
 
     public CmPayShop get(String id) {
         CmPayShop payShop = super.get(id);
@@ -92,6 +95,15 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 List<Integer> ids = new ArrayList<>();
                 for (NewShopOrder newShopOrder : newShopOrders) {
                     ids.add(newShopOrder.getShopOrderID());
+                    NewOrder order = newOrderDao.findByOrderID(newShopOrder.getOrderID());
+                    if ("2".equals(order.getOrderType())) {
+                        //呵呵商城订单
+                        newShopOrder.setOrderType(2);
+                        if (StringUtils.isBlank(newShopOrder.getClubName())) {
+                            String name = heHeNewOrderDao.findHeUser(order.getUserID());
+                            newShopOrder.setClubName(name);
+                        }
+                    }
                 }
                 List<Integer> id = cmPayShopDao.hasReapply(payShop.getId(), ids);
                 if (id.isEmpty()) {
@@ -164,6 +176,10 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 NewOrder newOrder = newOrderDao.get(so.getOrderID().toString());
                 if (null != newOrder) {
                     so.setReceiptStatus(newOrder.getReceiptStatus());
+                    if ("2".equals(newOrder.getOrderType())) {
+                        //呵呵商城订单
+                        so.setOrderType(2);
+                    }
                 } else {
                     so.setReceiptStatus("1");
                 }

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

@@ -56,8 +56,6 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
     @Resource
     private CmRefundShopRecordDao cmRefundShopRecordDao;
     @Resource
-    private CmReturnedPurchaseProductDao cmReturnedPurchaseProductDao;
-    @Resource
     private CmRefundShopDao cmRefundShopDao;
     @Resource
     private CmDiscernReceiptDao cmDiscernReceiptDao;
@@ -268,6 +266,10 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             NewOrder newOrder = newOrderDao.get(so.getOrderID().toString());
             if (null != newOrder) {
                 so.setReceiptStatus(newOrder.getReceiptStatus());
+                if ("2".equals(newOrder.getOrderType())) {
+                    //呵呵商城订单
+                    so.setOrderType(2);
+                }
             } else {
                 so.setReceiptStatus("1");
             }

src/main/resources/mappings/modules/hehe/HeHeNewOrderMapper.xml

@@ -247,7 +247,7 @@
 	</select>
 
     <select id="findHeUser" resultType="string">
-        SELECT name FROM cm_hehe_user WHERE userId = #{heUserId}
+        SELECT IFNULL(name,nickName) FROM cm_hehe_user WHERE userId = #{heUserId}
     </select>
 
 </mapper>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheProductList.jsp

@@ -111,7 +111,7 @@
 				</td>
 				<td>
 					${cmHeheProduct.includedTax eq 0 ? "不含税" : "含税"}-
-					${cmHeheProduct.includedTax eq 1 ? "增值税专用发票" : cmHeheProduct.includedTax eq 1 ? "增值税普通发票" : "不能开票"}
+					${cmHeheProduct.invoiceType eq 1 ? "增值税专用发票" : cmHeheProduct.invoiceType eq 2 ? "增值税普通发票" : "不能开票"}
 				</td>
 				<td>
 					<c:if test="${cmHeheProduct.validFlag eq 1}">

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

@@ -272,7 +272,10 @@
 								<c:if test="${orderInfo.organizeID == 1}">
                                     <span class="org-note">星范</span>
                                 </c:if>
-									${orderInfo.customerName}<c:if test="${orderInfo.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+									${orderInfo.customerName}
+                    <c:if test="${orderInfo.organizeID == 3}">
+                        <em class="weishaIcon">维沙</em>
+                    </c:if>
 							</span>
                 <span><label>订单状态：</label>
 								<c:if test="${orderInfo.receiptStatus == 1}">待收款</c:if>

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

@@ -218,11 +218,12 @@
                 <c:if test="${cmDiscernReceipt.organizeID == 1}">
                     <span class="org-note">星范</span>
                 </c:if>
-                <c:if test="${empty cmDiscernReceipt.userName}">
-                    ${cmDiscernReceipt.name}<c:if test="${cmDiscernReceipt.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                    ${cmDiscernReceipt.name}
+                <c:if test="${cmDiscernReceipt.receiptOrderType eq 2}">
+                    <font color="red">(呵呵商城)</font>
                 </c:if>
-                <c:if test="${not empty cmDiscernReceipt.userName}">
-                    ${cmDiscernReceipt.name}<c:if test="${cmDiscernReceipt.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                <c:if test="${cmDiscernReceipt.organizeID == 3}">
+                    <em class="weishaIcon">维沙</em>
                 </c:if>
             </td>
             <td>${cmDiscernReceipt.orderType}</td>

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

@@ -128,7 +128,13 @@
 						<c:if test="${shopOrder.organizeID eq 1}">
 							<span class="org-note">星范</span>
 						</c:if>
-						${shopOrder.clubName}<c:if test="${shopOrder.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if><br>
+						${shopOrder.clubName}
+						<c:if test="${shopOrder.orderType eq 2}">
+							<span><font color="red">(呵呵商城)</font></span>
+						</c:if>
+						<c:if test="${shopOrder.organizeID == 3}">
+							<em class="weishaIcon">维沙</em>
+						</c:if><br>
 					</c:forEach>
 				</td>
 

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

@@ -166,7 +166,10 @@
 				</tr>
 				<tr>
 					<td>${s.shopName}</td>
-					<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+					<td colspan="3">
+							${s.buyer}
+						<c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
+						<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
 					<td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -455,7 +455,9 @@
                     <td>${s.shopName}</td>
                     <td colspan="3">
                         <c:if test="${s.organizeID eq 1}"><span class="org-note">星范</span></c:if>
-                            ${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                            ${s.clubName}
+                        <c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
+                        <c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
                     </td>
                     <td>
                         <c:if test="${s.freight == 0}">