联合丽格 订单管理bugfix

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

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

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

@@ -0,0 +1,57 @@
+package com.caimei.modules.order.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.beans.Transient;
+import java.util.Date;
+import java.util.List;
+
+
+public class CmOrderPaymentVoucherVo {
+    private Integer id;
+    private Integer orderId;
+    private String remarks;
+    private Date addTime;
+    private  List<CmVoucherImage> images;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public List<CmVoucherImage> getImages() {
+        return images;
+    }
+
+    public void setImages(List<CmVoucherImage> images) {
+        this.images = images;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.caimei.modules.order.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+
+public class CmVoucherImage {
+    private Integer id;
+    private Integer voucherId;
+    private String image;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getVoucherId() {
+        return voucherId;
+    }
+
+    public void setVoucherId(Integer voucherId) {
+        this.voucherId = voucherId;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
+    }
+}

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

@@ -65,6 +65,10 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private Integer canRefundBeans;//    int(11) comment '可以退还的采美豆个数',
     private Integer orderDeliveryID;//   int(1) comment '运费订单ID',
     private Double freePostageFee;//    decimal(10,2) comment '订单包邮时本该支付的运费',
+
+
+
+    private Integer isColdChina;//    是否包含冷链费 0不包含 1包含
     private Integer freePostageTicketID;//  int(11) comment '使用的包邮券Id，为空表示未使用包邮券',
     private Double brokerage;//        decimal(11,2) comment '佣金',
     private String delFlag;//        national varchar(20) default '0' comment '后台删除状态 0正常，其他删除',
@@ -237,7 +241,13 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     public void setPromotionFullReduction(Double promotionFullReduction) {
         this.promotionFullReduction = promotionFullReduction;
     }
+    public Integer getIsColdChina() {
+        return isColdChina;
+    }
 
+    public void setIsColdChina(Integer isColdChina) {
+        this.isColdChina = isColdChina;
+    }
     public String getClubName() {
         return clubName;
     }

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

@@ -63,7 +63,9 @@ public class CmReceiptOrderRelationService extends CrudService<CmReceiptOrderRel
         List<CmReceiptOrderRelation> list = cmReceiptOrderRelationDao.findByOrderID(orderID);
         for (CmReceiptOrderRelation bean : list) {
             CmReceiType cmReceiType = collectionDao.oneData(bean.getPayType());
-            bean.setPayType(cmReceiType.getType());
+            if(cmReceiType!=null){
+                bean.setPayType(cmReceiType.getType());
+            }
 //            bean.setPayType(OrderUtil.getPayTypeStr(bean.getPayType()));
         }
         return list;

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

@@ -47,6 +47,7 @@ import com.thinkgem.jeesite.common.utils.DateUtils;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.modules.sys.utils.DictUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.ibatis.annotations.Param;
 import org.h2.util.New;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -130,6 +131,15 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     @Autowired
     private MessageCenterDao messageCenterDao;
 
+
+    public CmOrderPaymentVoucherVo findVoucherVoOrderID( Integer orderID){
+        return newOrderDao.findVoucherVoOrderID(orderID);
+    }
+
+    public List<CmVoucherImage> findCmVoucherImageoOrderID( Integer id){
+        return newOrderDao.findCmVoucherImageoOrderID(id);
+    }
+
     @Transactional(readOnly = false)
     public void updateClauseContent(NewOrder newOrder) {
         newOrderDao.updateClauseContent(newOrder);

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

@@ -1408,13 +1408,45 @@ public class NewOrderController extends BaseController {
             }
         }
         double returnValue = 0d;   //退货价值
-        if (order.getDiscountFee() >= returnedPurchaseFee) {
-            returnValue = 0d;   //如果经理折扣大于退款(退货)总金额之和  那么先抵扣经理折扣  退款价值为0
+        if (order.getDiscountFee() != null) {
+            if (order.getDiscountFee() >= returnedPurchaseFee) {
+                returnValue = 0d;   //如果经理折扣大于退款(退货)总金额之和  那么先抵扣经理折扣  退款价值为0
+            } else {
+                returnValue = returnedPurchaseFee - order.getDiscountFee(); //抵用完经理折扣后才是真实价值
+            }
+        }
+//        ColdChina，用IsColdChina判断
+//        PostageInfo 这两个是自己拼出来的
+//        PostageFlag 就是订单的freePostFlag
+//        Postage 就是订单freight
+        //联合丽格运费
+        String PostageInfo = null;
+        // 拼接运费信息--联合丽格
+        Integer isColdChina = order.getNewShopOrders().get(0).getIsColdChina();
+        Double ColdChina = Double.valueOf(700);
+        if (null != order.getNewShopOrders()&&isColdChina!=null) {
+            if ("-1" == order.getFreePostFlag()) {
+                // 到付
+                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
+            } else if ("0" == order.getFreePostFlag()) {
+                // 包邮
+                PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
+            } else {
+                // 有运费
+                PostageInfo = "￥" + order.getFreight() + "(" + (isColdChina == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(order.getFreight(), ColdChina)+ ")";
+            }
         } else {
-            returnValue = returnedPurchaseFee - order.getDiscountFee(); //抵用完经理折扣后才是真实价值
+            PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + order.getFreight().doubleValue();
+        }
+        //支付凭证
+        CmOrderPaymentVoucherVo voucherVo = newOrderService.findVoucherVoOrderID(order.getOrderID());
+        if (voucherVo != null) {
+            voucherVo.setImages(newOrderService.findCmVoucherImageoOrderID(voucherVo.getId()));
         }
         //订单已收金额
         Double brokerage = cmUtilsDao.selectPayTotalFees(order.getOrderID());
+        model.addAttribute("voucherVo", voucherVo);
+        model.addAttribute("postageInfo", PostageInfo);
         model.addAttribute("brokerage", brokerage);
         Double receiptAmount = cmDiscernReceiptService.findOrderReceipt(order.getOrderID());
         model.addAttribute("returnValue", returnValue);

src/main/java/com/caimei/modules/weisha/entity/CmMallUser.java

@@ -167,5 +167,6 @@ public class CmMallUser extends DataEntity<CmMallUser> {
 
     public void setEndTime(String endTime) {
         this.endTime = endTime;
+
     }
 }

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

@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.order.dao.NewOrderDao">
-
+    <resultMap id="cmOrderPaymentVoucherVoResult" type="com.caimei.modules.order.entity.CmOrderPaymentVoucherVo">
+        <id     property="id"    column="id"     />
+        <result property="orderId"  column="orderId"   />
+        <result property="remarks"  column="remarks"   />
+        <result property="addTime"  column="addTime"   />
+        <collection  property="images"   javaType="java.util.List" resultMap="cmVoucherImageResult" />
+    </resultMap>
+    <resultMap id="cmVoucherImageResult" type="com.caimei.modules.order.entity.CmVoucherImage">
+        <id     property="id"    column="id"     />
+        <result property="voucherId"  column="voucherId"/>
+        <result property="image"  column="image"   />
+    </resultMap>
     <sql id="columns">
         a.orderSeen AS orderSeen,
 		a.orderID AS orderID,
@@ -292,6 +303,7 @@
             </if>
             AND co.delFlag = 0
         </where>
+        GROUP BY co.orderID
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
                 ORDER BY ${page.orderBy}
@@ -1440,6 +1452,16 @@
         SELECT COUNT(*) FROM cm_split_account WHERE shopOrderId=#{shopOrderId}
         AND DATE_ADD(splitTime,INTERVAL 1 DAY) <![CDATA[  <  ]]> now()
     </select>
+    <select id="findVoucherVoOrderID" resultMap="cmOrderPaymentVoucherVoResult">
+--         SELECT * from cm_order_payment_voucher v
+        SELECT v.*,i.* from cm_order_payment_voucher v
+        LEFT JOIN cm_voucher_image i on  i.voucherId=v.id
+        where orderId = #{orderId}
+    </select>
+    <select id="findCmVoucherImageoOrderID" resultType="com.caimei.modules.order.entity.CmVoucherImage">
+        SELECT * from cm_voucher_image
+        where voucherId = #{id}
+    </select>
     <insert id="insertSplitAccount">
         INSERT INTO cm_split_account (orderId, productId, orderProductId, shopId, couponRecordId, vipRecordId,
                                       authVipRecordId, type, subUserNo, splitAccount,

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

@@ -13,6 +13,7 @@
 			a.orderNo AS  orderNo,
 			a.userID  AS userID,
 			a.shopID  AS shopID,
+			a.isColdChina  AS isColdChina,
 			a.itemCount  AS itemCount,
 			a.townID  AS townID,
 			a.productAmount  AS productAmount,

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

@@ -338,7 +338,7 @@
                             </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 && order.orderType != 3}">
+                            <c:if test="${order.rechargeGoods ne 1 && order.rechargeGoods ne 2 && order.organizeID != 4}">
                                 <c:if test="${cmReturnedPurchase.refundBalanceFee>0}">
                                     <input class="check-item-review refundBalanceFee" checked type="checkbox"/>
                                 </c:if>
@@ -448,13 +448,13 @@
             <td>
                 应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00"
                                         maxFractionDigits="2"/>
-                <c:if test="${order.orderType != 3}">
+                <c:if test="${order.organizeID != 4}">
                     (账户余额抵扣：${order.balancePayFee})
                 </c:if>
                 <a href="${ctx}/order/cmDiscernReceipt/detail?id=${lastReceiptDetailId}"
                    style="text-decoration: underline;margin-left: 20px">查看订单收款情况</a>
             </td>
-            <c:if test="${order.orderType != 3}">
+            <c:if test="${order.organizeID != 4}">
             <td>
                 经理折扣：￥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00"
                                         maxFractionDigits="2"/>
@@ -618,7 +618,7 @@
                                         单价：￥<fmt:formatNumber type="number" value="${newOrderProduct.price}"  pattern="0.00" maxFractionDigits="2" />
                                         <c:if test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if>
                                     </td>
-                                    <c:if test="${order.orderType != 3}">
+                                    <c:if test="${order.organizeID != 4}">
                                     <td >
                                         折扣 ：${newOrderProduct.discount}%
                                     </td>
@@ -634,7 +634,7 @@
                                     <td>
                                         规格：${newOrderProduct.unit}
                                     </td>
-                                    <c:if test="${order.orderType != 3}">
+                                    <c:if test="${order.organizeID != 4}">
                                     <td style="width: 275px;">
                                         税率：${newOrderProduct.taxRate}%
                                     </td>
@@ -706,7 +706,7 @@
                                     <td style="width: 275px;">
                                         单价：￥<fmt:formatNumber type="number" value="${newOrderProduct.price}"  pattern="0.00" maxFractionDigits="2" />
                                     </td>
-                                    <c:if test="${order.orderType != 3}">
+                                    <c:if test="${order.organizeID != 4}">
                                     <td>
                                         折扣 ：${newOrderProduct.discount}%
                                     </td>
@@ -719,7 +719,7 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <c:if test="${order.orderType != 3}">
+                                    <c:if test="${order.organizeID != 4}">
                                     <td style="width: 275px;">
                                         税率：${newOrderProduct.taxRate}%
                                     </td>

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

@@ -291,13 +291,13 @@
         </td>
         <td>
             应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00" maxFractionDigits="2"/>
-            <c:if test="${order.orderType != 3}">
+            <c:if test="${order.organizeID != 4}">
                 (账户余额抵扣：${order.balancePayFee})
             </c:if>
             <a href="${ctx}/order/cmDiscernReceipt/detail?id=${lastReceiptDetailId}"
                style="text-decoration: underline;margin-left: 20px">查看订单收款情况</a>
         </td>
-        <c:if test="${order.orderType != 3}">
+        <c:if test="${order.organizeID != 4}">
             <td>
                 经理折扣：￥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00"
                                         maxFractionDigits="2"/>
@@ -447,7 +447,7 @@
                                 <font title="${cmReturnedPurchaseProduct.name}">${fns:abbr(cmReturnedPurchaseProduct.name,30)}</font>
                             </td>
                             <td>单价：￥${cmReturnedPurchaseProduct.price}</td>
-                            <c:if test="${order.orderType != 3}">
+                            <c:if test="${order.organizeID != 4}">
                                 <td>折扣：${cmReturnedPurchaseProduct.discount}</td>
                                 <td>折后单价：￥${cmReturnedPurchaseProduct.discountPrice}</td>
                             </c:if>
@@ -455,7 +455,7 @@
                         </tr>
                         <tr>
                             <td>规格：${cmReturnedPurchaseProduct.unit}</td>
-                            <c:if test="${order.orderType != 3}">
+                            <c:if test="${order.organizeID != 4}">
                                 <td>税率：${cmReturnedPurchaseProduct.taxRate}</td>
                                 <td>税费：￥${cmReturnedPurchaseProduct.totalAddedValueTax}</td>
                             </c:if>
@@ -513,7 +513,7 @@
     <%--</table>--%>
     <%--</form:form>--%>
 </c:forEach>
-<c:if test="${order.orderType != 3}">
+<c:if test="${order.organizeID != 4}">
     <table id="orderTable" class="table table-striped table-bordered table-condensed">
         <tr>
             <td>

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

@@ -283,7 +283,7 @@
                     <span class="refundFee"><fmt:formatNumber
                             value="${empty cmReturnedPurchase.refundFee?'0.00':(cmReturnedPurchase.refundFee)}"
                             pattern="#0.00"/></span>元&nbsp;&nbsp;&nbsp;
-                    <c:if test="${order.orderType != 3}">
+                    <c:if test="${order.organizeID != 4}">
                         (账户余额抵扣：${order.balancePayFee})
                     </c:if>
                 </td>
@@ -437,15 +437,15 @@
                 <td>
                     应收总额：￥<fmt:formatNumber type="number" value="${order.payableAmount}" pattern="0.00"
                                             maxFractionDigits="2"/>
-                    <c:if test="${order.orderType != 3}">
+                    <c:if test="${order.organizeID != 4}">
                         (账户余额抵扣：${order.balancePayFee})
                     </c:if>
                     <a href="${ctx}/order/cmDiscernReceipt/detail?id=${lastReceiptDetailId}"
                        style="text-decoration: underline;margin-left: 20px">查看订单收款情况</a>
                 </td>
-                <c:if test="${order.orderType != 3}">
+                <c:if test="${order.organizeID != 4}">
                     <td>
-                        经理折扣：￥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00"
+                        经理折扣：￥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00"></fmt:formatNumber>
                     </td>
                 </c:if>
                 <td>
@@ -644,7 +644,7 @@
                                     <td>单价：￥${cmReturnedPurchaseProduct.price}<c:if
                                             test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if></td>
                                     <c:if test="${order.collageFlag eq 1}"><font color="red">（拼团价）</font></c:if>
-                                    <c:if test="${order.orderType != 3}">
+                                    <c:if test="${order.organizeID != 4}">
                                     <td>折扣：${cmReturnedPurchaseProduct.discount}</td>
                                     <td>折后单价：￥${cmReturnedPurchaseProduct.discountPrice}</td>
                                     </c:if>
@@ -654,7 +654,7 @@
                                 </tr>
                                 <tr>
                                     <td>规格：${cmReturnedPurchaseProduct.unit}</td>
-                                    <c:if test="${order.orderType != 3}">
+                                    <c:if test="${order.organizeID != 4}">
                                     <td>税率：${cmReturnedPurchaseProduct.taxRate}</td>
                                     <td>税费：￥${cmReturnedPurchaseProduct.totalAddedValueTax}</td>
                                     </c:if>
@@ -698,7 +698,7 @@
 <c:if test="${empty cmReturnedPurchaseList}">
     <p style="text-align: center;"><font color="#1e90ff">暂无退货退款详情记录.....</font></p>
 </c:if>
-<c:if test="${not empty cmReturnedPurchaseList and order.orderType != 3}">
+<c:if test="${not empty cmReturnedPurchaseList and order.organizeID != 4}">
     <table id="orderTable" class="table table-striped table-bordered table-condensed">
         <tr>
             <td>

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

@@ -122,7 +122,7 @@
         <td>
             订单号(ID)：${order.orderNo}(${order.orderID})
         </td>
-        <c:if test="${order.orderType != 3}">
+        <c:if test="${order.organizeID != 4}">
             <td>
                 <c:if test="${order.organizeID != 1}">
                     订单类型：${fns:getDictLabel(order.orderType,'order_type' ,'' )}
@@ -267,7 +267,7 @@
         <td>
             应收总额：￥${order.payableAmount}
         </td>
-        <c:if test="${order.orderType != 3}">
+        <c:if test="${order.organizeID != 4}">
             <td>
                 经理折扣：￥${order.discountFee}
             </td>
@@ -292,7 +292,7 @@
         </td>
     </tr>
     <tr>
-        <c:if test="${order.orderType != 3}">
+        <c:if test="${order.organizeID != 4}">
             <td>优惠券：${order.couponAmount}</td>
         </c:if>
         <td>退款总额:￥${refundFee}</td>

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

@@ -313,7 +313,7 @@
                 <c:if test="${cmDiscernReceipt.receiptOrderType eq 2}">
                     <font color="red">(呵呵商城)</font>
                 </c:if>
-                <c:if test="${cmDiscernReceipt.receiptOrderType eq 3}">
+                <c:if test="${cmDiscernReceipt.organizeID eq 4}">
                     <font color="red">(联合丽格)</font>
                 </c:if>
                 <c:if test="${cmDiscernReceipt.receiptType eq 8}">

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

@@ -282,8 +282,8 @@
                         <span class="org-note">星范</span>
                     </c:if>
                         ${order.buyer}
-                    <c:if test="${order.orderType == 3}">
-                        <span class="org-note">（联合丽格）</span>
+                    <c:if test="${order.organizeID == 4}">
+                        <span class="org-note"  style="width: 80px">（联合丽格）</span>
                     </c:if>
                 </a>
             </li>

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

@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <html>
 <head>
     <title>订单列表</title>
@@ -408,7 +409,7 @@
         <td>返佣订单: ${(order.rebateOrder ne '0' || order.rebateFlag eq '1')?'是':'否'}</td>
     </tr>
     <tr>
-        <c:if test="${order.orderType != 3}">
+        <c:if test="${order.organizeID != 4}">
             <td>订单类型: <c:if test="${order.orderType == 1}">自主订单</c:if><c:if
                     test="${order.orderType == 0}">协销订单</c:if></td>
         </c:if>
@@ -526,7 +527,7 @@
             </td>
         </c:if>
         <td>机构：${order.buyer}
-            <font id="svipFlagLabel" style="margin-left:10px" color="red">
+            <font id="svipFlagLabel" style="margin-left:0px" color="red">
                 <c:if test="${order.bpOrderUserinfo.firstClubType eq 1 and order.bpOrderUserinfo.svipFlag eq 1}">
                     (医美机构，超级会员)
                 </c:if>
@@ -536,10 +537,9 @@
                 <c:if test="${order.bpOrderUserinfo.firstClubType eq null and order.bpOrderUserinfo.svipFlag eq 1}">
                     ${order.bpOrderUserinfo.svipFlag eq 1?'(超级会员)':''}
                 </c:if>
-                <c:if test="${order.orderType == 3}">（联合丽格）</c:if>
+                <c:if test="${order.organizeID == 4}">（联合丽格）</c:if>
             </font>
-            <c:if test="${order.organizeID >= 3}"><label
-                    style="margin-left: 20px">门店：${order.organizeStoreName}</label> </c:if></td>
+        </td>
         <td>收货人: ${order.bpOrderUserinfo.shouHuoRen}</td>
     </tr>
     <tr>
@@ -575,7 +575,7 @@
     <tr>
         <td>
             应收金额：<fmt:formatNumber value="${order.payableAmount}" type="currency"/>
-            <c:if test="${order.orderType != 3}">
+            <c:if test="${order.organizeID != 4}">
             <span style="color: red">
                 <c:if test="${order.balancePayFee gt 0}">
                     <a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${order.userID}"
@@ -603,7 +603,7 @@
         </td>
         <td>
             退款金额（已完成）：<fmt:formatNumber value="${returnValue}" type="currency"/>
-            <c:if test="${order.orderType != 3}">
+            <c:if test="${order.organizeID != 4}">
             <span style="color: red">
                     (原<fmt:formatNumber value="${returnedPurchaseFee}" type="currency"/>，折扣取消
                     <c:if test="${order.discountFee gt returnedPurchaseFee}"><fmt:formatNumber
@@ -615,7 +615,7 @@
         </td>
     </tr>
     <tr>
-        <c:if test="${order.orderType != 3}">
+        <c:if test="${order.organizeID != 4}">
             <td>
                 经理折扣：
                 <c:if test="${order.discountFee gt 0}">
@@ -639,20 +639,25 @@
             </td>
         </c:if>
         <td>运费：
-            <c:if test="${order.freePostFlag == 0}">
-                包邮
-            </c:if>
-            <c:if test="${order.freePostFlag == -1}">
-                到付
-            </c:if>
-            <c:if test="${order.freePostFlag == -2}">
-                仪器到付-产品包邮
-            </c:if>
-            <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
-                <fmt:formatNumber value="${order.freight}" type="currency"/>
+            <c:if test="${order.organizeID != 4}">
+                <c:if test="${order.freePostFlag == 0}">
+                    包邮
+                </c:if>
+                <c:if test="${order.freePostFlag == -1}">
+                    到付
+                </c:if>
+                <c:if test="${order.freePostFlag == -2}">
+                    仪器到付-产品包邮
+                </c:if>
+                <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
+                    <fmt:formatNumber value="${order.freight}" type="currency"/>
+                </c:if>
+                <c:if test="${order.userBeans > 0}">
+                    <font color="red">（采美豆抵用：${order.userBeans}）</font>
+                </c:if>
             </c:if>
-            <c:if test="${order.userBeans > 0}">
-                <font color="red">（采美豆抵用：${order.userBeans}）</font>
+            <c:if test="${order.organizeID == 4}">
+                ${postageInfo}
             </c:if>
         </td>
         <td style="position: relative;"><a class="operation-btn btn">功能</a>
@@ -663,11 +668,11 @@
                         <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">
                             <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>
                         </c:if>
-                        <c:if test="${order.receiptStatus == 2 && order.status != 6 && order.status != 7&& order.orderType !=3}">
+                        <c:if test="${order.receiptStatus == 2 && order.status != 6 && order.status != 7&& order.organizeID != 4}">
                             <a href="javascript:void(0);" onclick="collection(${order.orderID})">抹平收款</a>
                         </c:if>
                     </c:if>
-                    <c:if test="${order.orderType !=3}">
+                    <c:if test="${order.organizeID != 4}">
                         <c:if test="${order.organizeID == 0}">
                             <c:if test="${order.status == 0}">
                                 <a href="${ctx}/order/confirmOrder?orderID=${order.orderID}"
@@ -746,7 +751,7 @@
                 </shiro:hasPermission>
 
                 <shiro:hasPermission name="order:order:edit">
-                    <c:if test="${order.orderType !=3}">
+                    <c:if test="${order.organizeID != 4}">
                         <c:if test="${(order.rebateOrder == '1' ) && (brokerage == 0) && (order.status != 0)}">
                             <a href="${ctx}/order/toChangePay?orderId=${order.orderID}"
                                onclick="return confirmx('确定将该返佣订单直接置为已收款和已付款状态吗？', this.href)">置为已收款已付款</a>
@@ -769,7 +774,6 @@
                         </c:if>
                         <a href="${ctx}/order/exportOrder?id=${order.orderID}">订单导出</a>
                         <%--                        <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>--%>
-                        <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
                         <c:if test="${order.orderType ==0}">
                             <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>
                         </c:if>
@@ -795,6 +799,8 @@
                             </a>
                         </c:if>
                     </c:if>
+                    <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
+
                 </shiro:hasPermission>
             </div>
         </td>
@@ -870,9 +876,12 @@
             <span>应付金额：<fmt:formatNumber value="${shopOrder.realPay}" type="currency"/></span>
             <span>
                 已付金额：<fmt:formatNumber value="${shopOrder.receiptAmount}" type="currency"/>
-                <c:if test="${shopOrder.commercialCode eq 'E1807059160' && (order.receiptStatus == 2 || order.receiptStatus == 3)}">
+                <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>
             </span>
             <span>待付金额：<fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>
             <br/>
@@ -979,16 +988,16 @@
                     <%--二手订单详情--%>
                 <c:if test="${order.secondHandOrderFlag eq 1}">
                 <a href="${fns:getConfig('wwwServer')}flea-market-${op.productID}.html" target="_blank">
-                    <img class="supplier-img" src="${op.image}"/>
+                    <img class="supplier-img" src="${op.image}" style="width: 100px"/>
                 </a>
                 </c:if>
                     <%--正常订单详情--%>
                 <c:if test="${order.secondHandOrderFlag ne 1}">
                 <a href="${fns:getConfig('wwwServer')}product-${op.productID}.html" target="_blank">
-                    <img class="supplier-img" src="${op.image}"/>
-                        </a>
-                    </c:if>
-                <c:if test="${order.orderType != 3}">
+                    <img class="supplier-img" src="${op.image}" style="width: 100px"/>
+                </a>
+                </c:if>
+                <c:if test="${order.organizeID != 4}">
                 <div class="supplier-name">
                     <c:if test="${op.name eq op.aliasName || op.productID eq 6060}">
                         <div class="supplier-product-name">${op.name}</div>
@@ -999,21 +1008,21 @@
                     </c:if>
                     <c:if test="${op.productType eq 1}">
                         <div class="supplier-product-name"><label style="color: red">协商赠品</label></div>
+                    </c:if>
+                    <c:if test="${op.productType eq 2}">
+                        <div class="supplier-product-name"><label style="color: red">促销赠品</label></div>
+                    </c:if>
+                    <c:if test="${op.includedTax eq 1}">
+                        <div class="supplier-product-name"><label style="color: red">(含税)</label></div>
+                    </c:if>
+                    <c:if test="${op.includedTax ne '' and op.includedTax eq 0}">
+                        <c:if test="${op.invoiceType eq 3 }">
+                            <div class="supplier-product-name"><label style="color: red">(不含税-不能开票)</label></div>
                         </c:if>
-                        <c:if test="${op.productType eq 2}">
-                            <div class="supplier-product-name"><label style="color: red">促销赠品</label></div>
-                        </c:if>
-                        <c:if test="${op.includedTax eq 1}">
-                            <div class="supplier-product-name"><label style="color: red">(含税)</label></div>
-                        </c:if>
-                        <c:if test="${op.includedTax ne '' and op.includedTax eq 0}">
-                            <c:if test="${op.invoiceType eq 3 and order}">
-                                <div class="supplier-product-name"><label style="color: red">(不含税-不能开票)</label></div>
-                            </c:if>
-                            <c:if test="${op.invoiceType eq 2 or op.invoiceType eq 1}">
-                                <div class="supplier-product-name"><label style="color: red">(不含税-能开票)</label></div>
-                            </c:if>
+                        <c:if test="${op.invoiceType eq 2 or op.invoiceType eq 1}">
+                            <div class="supplier-product-name"><label style="color: red">(不含税-能开票)</label></div>
                         </c:if>
+                    </c:if>
                         <%--                        <c:if test="${order.returnGoodsStutas==2}">--%>
                         <%--                        <div class="supplier-product-name"><label style="color: red">(不能退货)</label></div>--%>
                         <%--                        </c:if>--%>
@@ -1059,7 +1068,7 @@
                                 </a>
                             </c:if>
                     </span>
-                    <c:if test="${order.orderType != 3}">
+                    <c:if test="${order.organizeID != 4}">
                         <span>折扣: ${op.discount}%</span>
                         <span>折后单价:
                         <c:if test="${op.productPromotion.mode eq 1}">
@@ -1073,7 +1082,7 @@
                     <span>数量:  x${op.num}</span>
 
                     <br>
-                    <c:if test="${order.orderType != 3}">
+                    <c:if test="${order.organizeID != 4}">
                         <span>税率:  ${(op.includedTax != '' and op.includedTax eq 0 and op.invoiceType eq 3)?'---': op.taxRate ne null?op.taxRate:0.0}%</span>
                         <span>税费: ${(op.includedTax eq 1 or (op.includedTax != '' and op.includedTax eq 0 and op.invoiceType eq 3))?'---': empty op.totalAddedValueTax ?0.00:(op.totalAddedValueTax)}</span>
                     </c:if>
@@ -1152,56 +1161,55 @@
                                         </tr>
                                     </table>
                                 </div>
-                            </c:if>
-                        </c:if>
-                    </c:if>
-                    <c:if test="${op.productID eq 999}">
-                        <span>数量:  x${op.num}</span>
-                    </c:if>
-                    <br>
-                </div>
-            </c:forEach>
+                </c:if>
+                </c:if>
+                </c:if>
+                <c:if test="${op.productID eq 999}">
+                <span>数量:  x${op.num}</span>
+                </c:if>
+                <br>
+                </c:forEach>
         </div>
     </div>
 
 </c:forEach>
 <%--组织订单暂时不显示发票和条款信息--%>
-<c:if test="${order.organizeID == 0}">
-    <c:if test="${order.orderType != 3}">
-        <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>
-        </div>
-    </c:if>
+<%--<c:if test="${order.organizeID == 0}">--%>
+<c:if test="${order.organizeID != 4}">
     <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>
+        <label>订单对机构是否可见：</label>
+        <c:if test="${order.orderSeen eq 1}">
+            <label>可见</label>
         </c:if>
-        <c:if test="${order.orderInvoice.type eq 2}">
-            <%--            <input name="invoice" type="radio" checked="checked">--%>
-            <label>增值税专用发票</label>
+        <c:if test="${order.orderSeen eq 2}">
+            <label>不可见</label>
         </c:if>
-        <c:if test="${order.orderInvoice.type eq null}">
-            <%--            <input name="invoice" type="radio" checked="checked">--%>
-            <label>不需要发票</label>
+        <c:if test="${order.orderSeen ne 1 and order.orderSeen ne 2}">
+            <label>未定义</label>
         </c:if>
-        <c:if test="${order.orderInvoice.type == 1}">
-            <br>
-            <div>
+    </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>
                 <span>
                     <c:if test="${order.orderInvoice.invoiceTitleType eq 0}">
                         个人抬头：
@@ -1232,11 +1240,11 @@
             </table>
         </c:if>
     </div>
-    <c:if test="${order.orderType != 3}">
-        <div class="order-rows">
-            <label>售后条款：</label>
-            <c:forEach items="${bpClauses}" var="items" varStatus="index">
-                <c:if test="${items.clauseType ne 0  }">
+<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  }">
                 <span>
                     <input id="clauseId${index.index+1}" class="clauseId" name="clauseID" type="radio"
                            value="${items.id}"${(order.clauseID)==(items.id)?'checked="checked"':''}
@@ -1247,10 +1255,28 @@
                     <a href="javascript:void(0);"
                        onclick="openClauseInfo(${index.index+1});"><label>${items.name}</label></a>
                 </span>
-                </c:if>
-            </c:forEach>
-        </div>
-    </c:if>
+            </c:if>
+        </c:forEach>
+    </div>
+</c:if>
+<%--</c:if>--%>
+<c:if test="${order.organizeID == 4&& voucherVo 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  }">
+            <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>
+            </div>
+        </c:if>
+        <p>备注: ${voucherVo.remarks}</p>
+    </div>
 </c:if>
 <script type="text/javascript">
     (function () {

src/main/webapp/WEB-INF/views/modules/weisha/CmMallUserList.jsp

@@ -53,8 +53,8 @@
     <c:forEach items="${page.list}" var="page">
         <tbody>
         <tr>
-            <td>${page.account eq null ? "" : page.account}</td>
             <td>${page.accountName eq null ? "" : page.accountName}</td>
+            <td>${page.account eq null ? "" : page.account}</td>
             <td>
                 <c:if test="${page.status eq 1}">
                     <font color="green">已上线</font>&nbsp;&nbsp;

src/main/webapp/WEB-INF/views/modules/weisha/cmMallUserForm.jsp

@@ -40,14 +40,14 @@
         <div class="control-group">
             <label class="control-label"><span class="red">*</span>姓名：</label>
             <div class="controls">
-                <form:input path="account" htmlEscape="false" class="input-xlarge required" maxlength="11"
+                <form:input path="accountName" htmlEscape="false" class="input-xlarge required" maxlength="11"
                             placeholder="最多10个字"/>
             </div>
         </div>
         <div class="control-group">
             <label class="control-label"><span class="red">*</span>手机号：</label>
             <div class="controls">
-                <form:input path="accountName" htmlEscape="false"  class="input-xlarge required" maxlength="11" placeholder="请输入手机号"/>
+                <form:input path="account" htmlEscape="false"  class="input-xlarge required" maxlength="11" placeholder="请输入手机号"/>
             </div>
         </div>
         <div class="control-group">
@@ -59,20 +59,24 @@
                 </form:select>
             </div>
         </div>
-        <div class="control-group">
-            <label class="control-label"><span class="red">*</span>密码：</label>
-            <div class="controls">
-                <form:input path="password" htmlEscape="false"  type="password" id="password" class="input-xlarge required" maxlength="16"
-                            placeholder="请输入8-16字母和数字的组合"/>
+
+        <c:if test="${mallUserInfo.id eq null}">
+            <div class="control-group">
+                <label class="control-label"><span class="red">*</span>密码：</label>
+                <div class="controls">
+                    <form:input path="password" htmlEscape="false"  type="password" id="password" class="input-xlarge required" maxlength="16"
+                                placeholder="请输入8-16字母和数字的组合"/>
+                </div>
             </div>
-        </div>
-        <div class="control-group">
-            <label class="control-label"><span class="red">*</span>确认密码：</label>
-            <div class="controls">
-                <form:input path="confirmPassword" type="password" id="confirmPassword" class="input-xlarge required"
-                            maxlength="16" placeholder="请再次输入密码"/>
+            <div class="control-group">
+                <label class="control-label"><span class="red">*</span>确认密码：</label>
+                <div class="controls">
+                    <form:input path="confirmPassword" type="password" id="confirmPassword" class="input-xlarge required"
+                                maxlength="16" placeholder="请再次输入密码"/>
+                </div>
             </div>
-        </div>
+        </c:if>
+
         <div class="control-group">
             &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
             &nbsp;&nbsp;<input class="btn btn-primary" type="button" value="返回" onclick="history.go(-1)"/>
@@ -82,14 +86,14 @@
 </form:form>
 <script type="text/javascript">
     $(document).ready(function () {
-
         //$("#name").focus();
         $("#searchForm").validate({
             submitHandler: function (form) {
                 var account = 0
                 var password = $("#password").val();
+                var id = $("#id").val();
                 var confirmPassword = $("#confirmPassword").val();
-                var accountName = $("#accountName").val();
+                var accountName = $("#account").val();
                 debugger
                 $.ajax({
                     type: 'get',
@@ -102,11 +106,11 @@
                     }
                 });
                 if (account == 0) {
-                    top.$.jBox.confirm("用户名已存在，请勿重复添加", '提示');
+                    top.$.jBox.confirm("手机号已存在，请勿重复添加", '提示');
                     return false;
                 }
                 // if (password.length >= 8 && password.length <= 16 ) {
-                if (!(/^(?![0-9]+$)(?![a-zA-Z]+$)[A-Za-z0-9]{8,16}$/.test(password))) {
+                if (!(/^(?![0-9]+$)(?![a-zA-Z]+$)[A-Za-z0-9]{8,16}$/.test(password))&&${mallUserInfo.id eq null}) {
                     top.$.jBox.confirm("请输入正确格式的密码", '提示');
                     return false;
                     // }

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

@@ -3,20 +3,33 @@ package com.caimei;
 import java.util.HashSet;
 import java.util.List;
 
+import com.caimei.modules.order.dao.NewOrderDao;
+import com.caimei.modules.order.entity.CmOrderPaymentVoucherVo;
 import org.junit.Test;
 
 import com.google.common.collect.Lists;
 
+import javax.annotation.Resource;
+
 /**
  * List 去重
  * @author LG
  * @date  2016年5月27日
  * @version 1.0
  */
+
 public class ListUniqueTest {
-	
+	@Resource
+	private NewOrderDao newOrderDao;
+	@Test
+	public void test1(){
+
+		CmOrderPaymentVoucherVo voucherVoOrderID = newOrderDao.findVoucherVoOrderID(21587);
+		System.out.println(voucherVoOrderID);
+	}
 	@Test
 	public void test(){
+
 		List<String> list=Lists.newArrayList();
 		list.add("a");
 		list.add("b");