联合丽格 bugfix

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -297,6 +297,27 @@ public class CmRefundsProductController extends BaseController {
             if (cmDiscernReceipt != null && "1".equals(cmDiscernReceipt.getPayWay()) && "1".equals(status)) {
                 returnOnline = true;
             }
+            //联合丽格运费
+            String PostageInfo = null;
+            // 拼接运费信息--联合丽格
+            boolean isColdChina = newOrder.getNewShopOrders().stream().map(NewShopOrder::getIsColdChina).collect(Collectors.toList()).contains(1);
+            Double ColdChina = Double.valueOf(700);
+
+            if (isColdChina) {
+                if ("-1" == newOrder.getFreePostFlag()) {
+                    // 到付
+                    PostageInfo = "￥" + newOrder.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
+                } else if ("0" == newOrder.getFreePostFlag()) {
+                    // 包邮
+                    PostageInfo = "￥" + newOrder.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
+                } else {
+                    // 有运费
+                    PostageInfo = "￥" + newOrder.getFreight() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(newOrder.getFreight(), ColdChina)+ ")";
+                }
+            } else {
+                PostageInfo = newOrder.getFreePostFlag() == "-1" ? "到付" : newOrder.getFreePostFlag() == "0" ? "包邮" : "￥" + newOrder.getFreight();
+            }
+            model.addAttribute("postageInfo", PostageInfo);
             Integer lastReceiptDetailId = cmDiscernReceiptDao.findOrderLastReceiptDetailId(newOrder.getOrderID().toString());
             model.addAttribute("lastReceiptDetailId", lastReceiptDetailId);
             model.addAttribute("isPromotions", isPromotions);
@@ -655,6 +676,27 @@ public class CmRefundsProductController extends BaseController {
             bpClause.setEnabledStatus("1");
             List<BpClause> bpClauses = bpClauseService.findList(bpClause);
             Integer lastReceiptDetailId = cmDiscernReceiptDao.findOrderLastReceiptDetailId(newOrder.getOrderID().toString());
+            //联合丽格运费
+            String PostageInfo = null;
+            // 拼接运费信息--联合丽格
+            boolean isColdChina = newOrder.getNewShopOrders().stream().map(NewShopOrder::getIsColdChina).collect(Collectors.toList()).contains(1);
+            Double ColdChina = Double.valueOf(700);
+
+            if (isColdChina) {
+                if ("-1" == newOrder.getFreePostFlag()) {
+                    // 到付
+                    PostageInfo = "￥" + newOrder.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
+                } else if ("0" == newOrder.getFreePostFlag()) {
+                    // 包邮
+                    PostageInfo = "￥" + newOrder.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
+                } else {
+                    // 有运费
+                    PostageInfo = "￥" + newOrder.getFreight() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(newOrder.getFreight(), ColdChina)+ ")";
+                }
+            } else {
+                PostageInfo = newOrder.getFreePostFlag() == "-1" ? "到付" : newOrder.getFreePostFlag() == "0" ? "包邮" : "￥" + newOrder.getFreight();
+            }
+            model.addAttribute("postageInfo", PostageInfo);
             model.addAttribute("lastReceiptDetailId", lastReceiptDetailId);
             model.addAttribute("from", from);
             model.addAttribute("bpClauses", bpClauses);
@@ -678,8 +720,8 @@ public class CmRefundsProductController extends BaseController {
     @RequestMapping(value = "toRecturnRecord")
     public String toRecturnRecord(CmReturnedPurchase cmReturnedPurchase, HttpServletRequest request, HttpServletResponse response, Model model) {
         try {
-            NewOrder newOrder = newOrderService.get(cmReturnedPurchase.getOrderID().toString());
-            cmReturnedPurchase.setOrderType(Integer.valueOf(newOrder.getOrderType()));
+            NewOrder order = newOrderService.get(cmReturnedPurchase.getOrderID().toString());
+            cmReturnedPurchase.setOrderType(Integer.valueOf(order.getOrderType()));
             List<CmReturnedPurchase> dataList = cmReturnedPurchaseService.getReturnedPurchaseList(cmReturnedPurchase);
             BpClause bpClause = new BpClause();
             bpClause.setEnabledStatus("1");
@@ -692,11 +734,32 @@ public class CmRefundsProductController extends BaseController {
                     refundFee += bean.getRefundFee();
                 }
             }
-            Integer lastReceiptDetailId = cmDiscernReceiptDao.findOrderLastReceiptDetailId(newOrder.getOrderID().toString());
+            //联合丽格运费
+            String PostageInfo = null;
+            // 拼接运费信息--联合丽格
+            boolean isColdChina = order.getNewShopOrders().stream().map(NewShopOrder::getIsColdChina).collect(Collectors.toList()).contains(1);
+            Double ColdChina = Double.valueOf(700);
+
+            if (isColdChina) {
+                if ("-1" == order.getFreePostFlag()) {
+                    // 到付
+                    PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
+                } else if ("0" == order.getFreePostFlag()) {
+                    // 包邮
+                    PostageInfo = "￥" + order.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
+                } else {
+                    // 有运费
+                    PostageInfo = "￥" + order.getFreight() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(order.getFreight(), ColdChina)+ ")";
+                }
+            } else {
+                PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + order.getFreight();
+            }
+            model.addAttribute("postageInfo", PostageInfo);
+            Integer lastReceiptDetailId = cmDiscernReceiptDao.findOrderLastReceiptDetailId(order.getOrderID().toString());
             model.addAttribute("lastReceiptDetailId", lastReceiptDetailId);
             model.addAttribute("bpClauses", bpClauses);
             model.addAttribute("cmReturnedPurchaseList", dataList);
-            model.addAttribute("order", newOrder);
+            model.addAttribute("order", order);
             model.addAttribute("returnedPurchaseFee", returnedPurchaseFee);
             model.addAttribute("refundFee", refundFee);
         } catch (Exception e) {
@@ -772,6 +835,27 @@ public class CmRefundsProductController extends BaseController {
                 List<CmPayShopRecord> payShopRecordList = newShopOrderService.getPayedRecords(shopOrderID.toString());
                 pr.addAll(payShopRecordList);
             }
+            //联合丽格运费
+            String PostageInfo = null;
+            // 拼接运费信息--联合丽格
+            boolean isColdChina = newOrder.getNewShopOrders().stream().map(NewShopOrder::getIsColdChina).collect(Collectors.toList()).contains(1);
+            Double ColdChina = Double.valueOf(700);
+
+            if (isColdChina) {
+                if ("-1" == newOrder.getFreePostFlag()) {
+                    // 到付
+                    PostageInfo = "￥" + newOrder.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
+                } else if ("0" == newOrder.getFreePostFlag()) {
+                    // 包邮
+                    PostageInfo = "￥" + newOrder.getFreePostFlag() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
+                } else {
+                    // 有运费
+                    PostageInfo = "￥" + newOrder.getFreight() + "(" + (isColdChina ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(newOrder.getFreight(), ColdChina)+ ")";
+                }
+            } else {
+                PostageInfo = newOrder.getFreePostFlag() == "-1" ? "到付" : newOrder.getFreePostFlag() == "0" ? "包邮" : "￥" + newOrder.getFreight();
+            }
+            model.addAttribute("postageInfo", PostageInfo);
             model.addAttribute("pr", pr);
             model.addAttribute("cmReturnedPurchaseList", dataList);
             model.addAttribute("order", newOrder);

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

@@ -37,6 +37,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -159,8 +160,9 @@ public class CmDiscernReceiptController extends BaseController {
         ReceiptDetailVo vo = cmDiscernReceiptService.detail(cmDiscernReceipt);
         CmDiscernReceipt op = cmDiscernReceiptService.orderlist(cmDiscernReceipt);
         //支付凭证
-        List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(Integer.valueOf(cmDiscernReceipt.getOrderID()));
-        model.addAttribute("voucherVo", voucherVo);
+        String orderID = cmDiscernReceipt.getOrderID() != null &&!cmDiscernReceipt.getOrderID().equals("") ?  cmDiscernReceipt.getOrderID():"0";
+        List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(Integer.valueOf(orderID));
+        model.addAttribute("voucherVo", voucherVo.size()==0?null:voucherVo);
         model.addAttribute("organizeID", cmDiscernReceipt.getOrganizeID());
         model.addAttribute("vo", vo);
         model.addAttribute("op", op);

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

@@ -1438,10 +1438,11 @@ public class NewOrderController extends BaseController {
             PostageInfo = order.getFreePostFlag() == "-1" ? "到付" : order.getFreePostFlag() == "0" ? "包邮" : "￥" + order.getFreight();
         }
         //支付凭证
+        Integer orderID = order.getOrderID() == null ? 0: order.getOrderID();
         List<CmOrderPaymentVoucherVo> voucherVo = newOrderService.findVoucherVoOrderID(order.getOrderID());
         //订单已收金额
         Double brokerage = cmUtilsDao.selectPayTotalFees(order.getOrderID());
-        model.addAttribute("voucherVo", voucherVo);
+        model.addAttribute("voucherVo", voucherVo.size()==0?null:voucherVo);
         model.addAttribute("postageInfo", PostageInfo);
         model.addAttribute("brokerage", brokerage);
         Double receiptAmount = cmDiscernReceiptService.findOrderReceipt(order.getOrderID());

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

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

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

@@ -9,8 +9,8 @@
         <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"/>
+        <id     property="id"    column="i.id"     />
+        <result property="voucherId"  column="v.id"/>
         <result property="image"  column="image"   />
     </resultMap>
     <sql id="columns">

src/main/resources/mappings/modules/user/CmUserOrganizeMapper.xml

@@ -241,7 +241,7 @@
 	</select>
 
 	<select id="findOrganize" resultType="com.caimei.modules.user.entity.CmUserOrganize">
-		SELECT * FROM cm_mall_organize WHERE delFlag='0' AND id <![CDATA[ > ]]> 2
+		SELECT * FROM cm_mall_organize WHERE delFlag='0' AND id <![CDATA[ > ]]> 3
 	</select>
 
 	<select id="findAllList" resultType="CmUserOrganize">

src/main/resources/mappings/modules/weisha/CmMallOrganizeMapper.xml

@@ -36,7 +36,7 @@
 		FROM cm_mall_organize a
 		<include refid="cmMallOrganizeJoins"/>
 		<where>
-			id > 0
+			id > 3
 			<if test="organizeName != null and organizeName != ''">
 				AND a.organizeName LIKE concat('%',#{organizeName},'%')
 			</if>

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

@@ -461,20 +461,25 @@
             </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>
         </tr>
@@ -1077,6 +1082,7 @@
 
         //本次退货和本次取消
         $('body').on('input','.refundGoodsInput, .cancelGoodsInput,.refundGoodsInput1',function() {
+            debugger
             var receiptStatus = $('#receiptStatus').val(),
                 refundFee = 0,
                 originalAmount = getTotalAmount(); // 所有商品原始总金额

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

@@ -305,20 +305,25 @@
         </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>
     </tr>

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

@@ -445,26 +445,33 @@
                 </td>
                 <c:if test="${order.organizeID != 4}">
                     <td>
-                        经理折扣：￥<fmt:formatNumber type="number" value="${order.discountFee}" pattern="0.00"></fmt:formatNumber>
+                        经理折扣：￥<fmt:formatNumber type="number" value="${order.discountFee}"
+                                                pattern="0.00"></fmt:formatNumber>
                     </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.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
+                    <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 test="${order.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
+                        </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>
             </tr>

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

@@ -274,20 +274,26 @@
         </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}" pattern="0.00"/>
+            <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}" pattern="0.00"/>
+                </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>
     </tr>

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

@@ -608,8 +608,10 @@
             </div>
         </div>
     </c:if>
-    <c:if test="${organizeID == 4&& voucherVo ne null &&voucher.addTime ne null }">
+
+    <c:if test="${organizeID == 4&& voucherVo ne null }">
         <div class="order-rows">
+
             <label>线下支付凭证：</label>
             <c:forEach items="${voucherVo}" var="voucher">
                 <div>
@@ -619,7 +621,7 @@
                             <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"/>
+                                        <img class="supplier-img" src="${items.image}" style="width: 120px;height: 120px"/>
                                     </a>
                                 </c:if>
                             </c:forEach>

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

@@ -314,7 +314,7 @@
                     <font color="red">(呵呵商城)</font>
                 </c:if>
                 <c:if test="${cmDiscernReceipt.organizeID eq 4}">
-                    <font color="red">(联合丽格)</font>
+                    <span style="width: 120px;color: red;display: inline-block">（联合丽格）</span>
                 </c:if>
                 <c:if test="${cmDiscernReceipt.receiptType eq 8}">
                     ${cmDiscernReceipt.backName}
@@ -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}&organizeID=${cmDiscernReceipt.organizeID}&orderID=${cmDiscernReceipt.orderID}">查看详情</a>
+                    <a href="${ctx}/order/cmDiscernReceipt/detail?checkMan=${cmDiscernReceipt.checkMan}&orderID=${cmDiscernReceipt.orderID}&shopName=${cmDiscernReceipt.shopName}&id=${cmDiscernReceipt.id}&organizeID=${cmDiscernReceipt.organizeID}">查看详情</a>
                 </td>
             </shiro:hasPermission>
         </tr>

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

@@ -290,7 +290,7 @@
                     </c:if>
                         ${order.buyer}
                     <c:if test="${order.organizeID == 4}">
-                        <span class="org-note"  style="width: 80px">（联合丽格）</span>
+                        <span style="width: 120px;color: red;display: inline-block">（联合丽格）</span>
                     </c:if>
                 </a>
             </li>

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

@@ -1281,7 +1281,7 @@
                         <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"/>
+                                    <img class="supplier-img" src="${items.image}" style="width: 120px;height: 120px"/>
                                 </a>
                             </c:if>
                         </c:forEach>