联合丽格 付款管理bugfix

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

@@ -16,7 +16,7 @@ import java.util.Set;
 @MyBatisDao
 public interface NewOrderDao extends CrudDao<NewOrder> {
 
-    CmOrderPaymentVoucherVo findVoucherVoOrderID(@Param("orderId") Integer orderID);
+    List<CmOrderPaymentVoucherVo> findVoucherVoOrderID(@Param("orderId") Integer orderID);
 
     List<CmVoucherImage> findCmVoucherImageoOrderID(@Param("id") Integer id);
 

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

@@ -12,7 +12,7 @@ import java.util.List;
  * @author lwt
  * @version 2019-06-19
  */
-public class CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
+public class    CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
 
     private static final long serialVersionUID = 1L;
     private String payWay;        // 用户付款方式：1线上，2线下

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

@@ -132,7 +132,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     private MessageCenterDao messageCenterDao;
 
 
-    public CmOrderPaymentVoucherVo findVoucherVoOrderID( Integer orderID){
+    public List<CmOrderPaymentVoucherVo> findVoucherVoOrderID( Integer orderID){
         return newOrderDao.findVoucherVoOrderID(orderID);
     }
 

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

@@ -158,6 +158,10 @@ public class CmDiscernReceiptController extends BaseController {
     public String detail(CmDiscernReceipt cmDiscernReceipt, Model model) {
         ReceiptDetailVo vo = cmDiscernReceiptService.detail(cmDiscernReceipt);
         CmDiscernReceipt op = cmDiscernReceiptService.orderlist(cmDiscernReceipt);
+        //支付凭证
+        List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(Integer.valueOf(cmDiscernReceipt.getOrderID()));
+        model.addAttribute("voucherVo", voucherVo);
+        model.addAttribute("organizeID", cmDiscernReceipt.getOrganizeID());
         model.addAttribute("vo", vo);
         model.addAttribute("op", op);
         model.addAttribute("checkMan", cmDiscernReceipt.getCheckMan());

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

@@ -68,6 +68,7 @@ import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 /**
@@ -1415,34 +1416,29 @@ public class NewOrderController extends BaseController {
                 returnValue = returnedPurchaseFee - order.getDiscountFee(); //抵用完经理折扣后才是真实价值
             }
         }
-//        ColdChina，用IsColdChina判断
-//        PostageInfo 这两个是自己拼出来的
-//        PostageFlag 就是订单的freePostFlag
-//        Postage 就是订单freight
+
         //联合丽格运费
         String PostageInfo = null;
         // 拼接运费信息--联合丽格
-        Integer isColdChina = order.getNewShopOrders().get(0).getIsColdChina();
+        boolean isColdChina = order.getNewShopOrders().stream().map(NewShopOrder::getIsColdChina).collect(Collectors.toList()).contains(1);
         Double ColdChina = Double.valueOf(700);
-        if (null != order.getNewShopOrders()&&isColdChina!=null) {
+
+        if (isColdChina) {
             if ("-1" == order.getFreePostFlag()) {
                 // 到付
-                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
+                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
             } else if ("0" == order.getFreePostFlag()) {
                 // 包邮
-                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
+                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
             } else {
                 // 有运费
-                PostageInfo = "￥" + order.getFreight() + "(" + (isColdChina == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(order.getFreight(), ColdChina)+ ")";
+                PostageInfo = "￥" + order.getFreight() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(order.getFreight(), ColdChina)+ ")";
             }
         } else {
-            PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + order.getFreight().doubleValue();
+            PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + order.getFreight();
         }
         //支付凭证
-        CmOrderPaymentVoucherVo voucherVo = newOrderService.findVoucherVoOrderID(order.getOrderID());
-        if (voucherVo != null) {
-            voucherVo.setImages(newOrderService.findCmVoucherImageoOrderID(voucherVo.getId()));
-        }
+        List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(order.getOrderID());
         //订单已收金额
         Double brokerage = cmUtilsDao.selectPayTotalFees(order.getOrderID());
         model.addAttribute("voucherVo", voucherVo);

src/main/resources/config/dev/caimei.properties

@@ -12,14 +12,14 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.cj.jdbc.Driver
-#jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-#jdbc.username=developer
-#jdbc.password=J5p3tgOVazNl4ydf
+jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+jdbc.username=developer
+jdbc.password=J5p3tgOVazNl4ydf
 
 
-jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-jdbc.username=developer
-jdbc.password=05bZ/OxTB:X+yd%1
+#jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#jdbc.username=developer
+#jdbc.password=05bZ/OxTB:X+yd%1
 
 #jdbc.url=jdbc:mysql://119.29.0.46:3306/caimei?useUnicode=true&characterEncoding=utf-8
 #jdbc.username=root

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

@@ -112,7 +112,7 @@
         -- 	relationType值为1是为子订单ID,为2时为主订单ID）
         SELECT
         <include refid="cmDiscernReceiptColumns"/>,
-        cso_s.orderID AS orderID,
+        cso_cr.orderID AS orderID,
         cso_s.shopOrderNo as shopOrderNos,
         cso.shopOrderId as shopOrderId,
         cof.bankAccount AS bankNameType,

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

@@ -372,9 +372,8 @@
                         </c:if>
                     </c:if>
                     <br>
-                    <div class="refund-details-block">
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <font color="red">*</font>开户名：;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <div class="refund-details-block" style="   white-space: nowrap;">
+                        <font color="red">*</font>开户名：
                         <from:input path="bankAccountName"  value="${empty cmReturnedPurchase.bankAccountName?'':(cmReturnedPurchase.bankAccountName)}"></from:input>
                         <font color="red">*</font>账号：
                         <from:input path="bankAccountNo"  value="${empty cmReturnedPurchase.bankAccountNo?'':(cmReturnedPurchase.bankAccountNo)}"></from:input>
@@ -382,7 +381,7 @@
                         <font color="red">*</font>开户行：
                         <from:input path="openBank"  value="${empty cmReturnedPurchase.openBank?'':(cmReturnedPurchase.openBank)}"></from:input>
                         <font color="red">*</font>账户类型：
-                        <select name="bankAccountType" id="bankAccountType">
+                        <select name="bankAccountType" id="bankAccountType" style="width: 100px">
                             <option value="" selected>请选择</option>
                             <option value="1" <c:if test="${not empty cmReturnedPurchase.bankAccountType && cmReturnedPurchase.bankAccountType eq 1}"> selected="selected"</c:if>>公账</option>
                             <option value="2" <c:if test="${not empty cmReturnedPurchase.bankAccountType && cmReturnedPurchase.bankAccountType eq 2}"> selected="selected"</c:if>>私账</option>

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

@@ -387,8 +387,10 @@
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
                 <form:option value="9999" label="呵呵商城"/>
-                <c:forEach items="${organizeList}" var="organize" varStatus="index">
-                    <form:option value="${organize.id}" label="${organize.organizeName}"/>
+                <c:forEach items="${cmUserOrganizeList}" var="organize">
+                    <c:if test="${organize.id!=4}">
+                        <form:option value="${organize.id}" label="${organize.organizeName}"/>
+                    </c:if>
                 </c:forEach>
             </form:select>
             <label>结算状态:</label>

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

@@ -228,7 +228,9 @@
                     ----------
                 </c:if>
 					</span>
-            <span class="receipt-details-new-row receipt-msg-wrapper"><label>收款短信：</label>${vo.smsContent eq null ? "无" : vo.smsContent eq "" ? "无" : vo.smsContent}</span>
+            <c:if test="${organizeID != 4}">
+                <span class="receipt-details-new-row receipt-msg-wrapper"><label>收款短信：</label>${vo.smsContent eq null ? "无" : vo.smsContent eq "" ? "无" : vo.smsContent}</span>
+            </c:if>
             <c:if test="${vo.receiptType == 3 && not empty vo.rebateRemarks}">
                 <span class="receipt-details-new-row receipt-msg-wrapper"><label>备注：</label>${vo.rebateRemarks}</span>
             </c:if>
@@ -240,9 +242,11 @@
             <div class="not-order-type">
                 <span><label>确认人:</label> ${vo.confirmer}</span>
                 <span><label>确认时间: </label>${vo.confirmTime}</span>
-                <c:if test="${vo.shopName != null && cmDiscernReceipt.newReceiptType != 2 && cmDiscernReceipt.newReceiptType != 5}"> <br> <span
+                <c:if test="${vo.shopName != null && cmDiscernReceipt.newReceiptType != 2 && cmDiscernReceipt.newReceiptType != 5}">
+                    <br> <span
                         class="not-order-reason"><label>关联供应商：</label>${vo.shopName}</span></c:if>
-                <c:if test="${vo.shopName == null && cmDiscernReceipt.newReceiptType != 2 && cmDiscernReceipt.newReceiptType != 5}"> <br> <span
+                <c:if test="${vo.shopName == null && cmDiscernReceipt.newReceiptType != 2 && cmDiscernReceipt.newReceiptType != 5}">
+                    <br> <span
                         class="not-order-reason"><label>关联供应商：</label>无</span> <br></c:if>
                 <br>
                 <c:if test="${not empty vo.noOrderReason}">
@@ -604,6 +608,28 @@
             </div>
         </div>
     </c:if>
+    <c:if test="${organizeID == 4&& voucherVo ne null &&voucher.addTime ne null }">
+        <div class="order-rows">
+            <label>线下支付凭证：</label>
+            <c:forEach items="${voucherVo}" var="voucher">
+                <div>
+                    <p><fmt:formatDate value="${voucher.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/></p>
+                    <c:if test="${voucher.images ne null  }">
+                        <div>
+                            <c:forEach items="${voucher.images}" var="items" varStatus="index">
+                                <c:if test="${items.image ne null  }">
+                                    <a href="${items.image}" target="_blank">
+                                        <img class="supplier-img" src="${items.image}" style="width: 100px"/>
+                                    </a>
+                                </c:if>
+                            </c:forEach>
+                        </div>
+                    </c:if>
+                    <p>备注: ${voucher.remarks}</p>
+                </div>
+            </c:forEach>
+        </div>
+    </c:if>
 </div>
 <script>
     (function () {

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

@@ -335,7 +335,7 @@
             </td>
             <shiro:hasPermission name="order:cmDiscernReceipt:edit">
                 <td>
-                    <a href="${ctx}/order/cmDiscernReceipt/detail?checkMan=${cmDiscernReceipt.checkMan}&shopName=${cmDiscernReceipt.shopName}&id=${cmDiscernReceipt.id}">查看详情</a>
+                    <a href="${ctx}/order/cmDiscernReceipt/detail?checkMan=${cmDiscernReceipt.checkMan}&shopName=${cmDiscernReceipt.shopName}&id=${cmDiscernReceipt.id}&organizeID=${cmDiscernReceipt.organizeID}&orderID=${cmDiscernReceipt.orderID}">查看详情</a>
                 </td>
             </shiro:hasPermission>
         </tr>

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

@@ -98,8 +98,13 @@
 					<form:option value="" label="请选择"/>
 					<form:option value="0" label="采美"/>
 					<form:option value="9999" label="呵呵商城"/>
-					<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
-								  htmlEscape="false"/>
+					<c:forEach items="${cmUserOrganizeList}" var="organize">
+						<c:if test="${organize.id!=4}">
+							<form:option value="${organize.id}" label="${organize.organizeName}"/>
+						</c:if>
+					</c:forEach>
+<%--					<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"--%>
+<%--								  htmlEscape="false"/>--%>
 				</form:select>&nbsp;&nbsp;&nbsp;&nbsp;
 				<label>付款类型：</label>
 				<form:select path="paymentType" class="input-medium">

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

@@ -337,7 +337,11 @@
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
                 <form:option value="9999" label="呵呵商城"/>
-                <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id" htmlEscape="false"/>
+                <c:forEach items="${cmUserOrganizeList}" var="organize">
+                    <c:if test="${organize.id!=4}">
+                        <form:option value="${organize.id}" label="${organize.organizeName}"/>
+                    </c:if>
+                </c:forEach>
             </form:select>
         </div>
         <div class="pay-status">

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

@@ -116,7 +116,11 @@
 				<form:option value="" label="请选择"/>
 				<form:option value="0" label="采美"/>
 				<form:option value="9999" label="呵呵商城"/>
-				<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id" htmlEscape="false"/>
+				<c:forEach items="${cmUserOrganizeList}" var="organize">
+					<c:if test="${organize.id!=4}">
+						<form:option value="${organize.id}" label="${organize.organizeName}"/>
+					</c:if>
+				</c:forEach>
 			</form:select>
 		</div>
 		<div class="pay-status">

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

@@ -85,8 +85,11 @@
 					<form:option value="" label="请选择"/>
 					<form:option value="0" label="采美"/>
 					<form:option value="9999" label="呵呵商城"/>
-					<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
-								  htmlEscape="false"/>
+					<c:forEach items="${cmUserOrganizeList}" var="organize">
+						<c:if test="${organize.id!=4}">
+							<form:option value="${organize.id}" label="${organize.organizeName}"/>
+						</c:if>
+					</c:forEach>
 				</form:select>
 				<input id="btnSubmit"  class="btn btn-primary"  type="submit" value=" 查询 " style="padding-left:50px;padding-right:50px;margin:0 20px;"/>
 				<input id="export" class="btn btn-primary" value="导出筛选结果"/>

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

@@ -124,6 +124,7 @@
 					<form:select path="organizeID"  class="select-ele input-medium required">
 						<form:option value="" label="请选择"/>
 						<form:option value="0" label="采美"/>
+						<form:option value="9999" label="呵呵商城"/>
 						<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
 									  htmlEscape="false"/>
 					</form:select>

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

@@ -187,6 +187,7 @@
                 <form:select path="organizeID" class="select-ele input-medium required">
                     <form:option value="" label="请选择"/>
                     <form:option value="0" label="采美365网"/>
+                    <form:option value="9999" label="呵呵商城"/>
                     <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
                                   htmlEscape="false"/>
                 </form:select>
@@ -247,16 +248,22 @@
             <li style="position: relative">${order.orderNo}
             </li>
             <li>
-                <c:if test="${order.orderType == 1}">
-                    自主订单
-                </c:if>
-                <c:if test="${order.orderType == 0}">
-                    协销订单
-                    <c:if test="${not empty order.spName}">
-                        <br>${fns:appendLast1('(',order.spName,')')}
+                <c:if test="${order.organizeID != 4}">
+                    <c:if test="${order.orderType == 1}">
+                        自主订单
+                    </c:if>
+                    <c:if test="${order.orderType == 0}">
+                        协销订单
+                        <c:if test="${not empty order.spName}">
+                            <br>${fns:appendLast1('(',order.spName,')')}
+                        </c:if>
+                    </c:if>
+                    <c:if test="${order.orderType > 1}">
+                        ---
                     </c:if>
                 </c:if>
-                <c:if test="${order.orderType > 1}">
+
+                <c:if test="${order.organizeID == 4}">
                     ---
                 </c:if>
             </li>
@@ -268,7 +275,7 @@
                     是
                 </c:if>
             </li>
-<%--            <li>--%>
+                <%--            <li>--%>
 <%--                <c:if test="${order.secondHandOrderFlag == '1'}">--%>
 <%--                    是--%>
 <%--                </c:if>--%>

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

@@ -791,7 +791,7 @@
                             <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>
                         </c:if>
                         <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">
-                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=2">收退款记录
+                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=2">收付款记录
                             </a>
                         </c:if>
                         <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">
@@ -879,8 +879,13 @@
                 <c:if test="${order.organizeID != 4&&shopOrder.commercialCode eq 'E1807059160' && (order.receiptStatus == 2 || order.receiptStatus == 3)}">
                     <font color="red">(采美信息线上收款)</font>
                 </c:if>
-                <c:if test="${order.organizeID == 4 && (order.receiptStatus == 2 || order.receiptStatus == 3)}">
-                    <font color="red">(联合丽格线上收款)</font>
+                <c:if test="${order.organizeID == 4}">
+                    <c:if test="${ voucherVo eq null &&voucher.addTime eq null }">
+                        <font color="red">(联合丽格线上收款)</font>
+                    </c:if>
+                    <c:if test="${ voucherVo ne null &&voucher.addTime ne null }">
+                        <font color="red">(联合丽格线下收款)</font>
+                    </c:if>
                 </c:if>
             </span>
             <span>待付金额：<fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>
@@ -1260,22 +1265,26 @@
     </div>
 </c:if>
 <%--</c:if>--%>
-<c:if test="${order.organizeID == 4&& voucherVo ne null  }">
+<c:if test="${order.organizeID == 4&& voucherVo ne null &&voucher.addTime ne null  }">
     <div class="order-rows">
         <label>线下支付凭证：</label>
-        <p><fmt:formatDate value="${voucherVo.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/></p>
-        <c:if test="${voucherVo.images ne null  }">
+        <c:forEach items="${voucherVo}" var="voucher">
             <div>
-                <c:forEach items="${voucherVo.images}" var="items" varStatus="index">
-                    <c:if test="${items.image ne null  }">
-                        <a href="${items.image}" target="_blank">
-                            <img class="supplier-img" src="${items.image}" style="width: 100px"/>
-                        </a>
-                    </c:if>
-                </c:forEach>
+                <p><fmt:formatDate value="${voucher.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/></p>
+                <c:if test="${voucher.images ne null  }">
+                    <div>
+                        <c:forEach items="${voucher.images}" var="items" varStatus="index">
+                            <c:if test="${items.image ne null  }">
+                                <a href="${items.image}" target="_blank">
+                                    <img class="supplier-img" src="${items.image}" style="width: 100px"/>
+                                </a>
+                            </c:if>
+                        </c:forEach>
+                    </div>
+                </c:if>
+                <p>备注: ${voucher.remarks}</p>
             </div>
-        </c:if>
-        <p>备注: ${voucherVo.remarks}</p>
+        </c:forEach>
     </div>
 </c:if>
 <script type="text/javascript">

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

@@ -287,7 +287,11 @@
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
                 <form:option value="9999" label="呵呵商城"/>
-                <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id" htmlEscape="false"/>
+                <c:forEach items="${cmUserOrganizeList}" var="organize">
+                    <c:if test="${organize.id!=4}">
+                        <form:option value="${organize.id}" label="${organize.organizeName}"/>
+                    </c:if>
+                </c:forEach>
             </form:select>
             <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         </div>

src/test/java/com/caimei/ListUniqueTest.java

@@ -24,8 +24,8 @@ public class ListUniqueTest {
 	@Test
 	public void test1(){
 
-		CmOrderPaymentVoucherVo voucherVoOrderID = newOrderDao.findVoucherVoOrderID(21587);
-		System.out.println(voucherVoOrderID);
+//		CmOrderPaymentVoucherVo voucherVoOrderID = newOrderDao.findVoucherVoOrderID(21587);
+//		System.out.println(voucherVoOrderID);
 	}
 	@Test
 	public void test(){