Merge remote-tracking branch 'origin/developerA' into developerA

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

@@ -230,14 +230,18 @@ public class CmRefundShopService extends CrudService<CmRefundShopDao, CmRefundSh
         cmRefundShop.setOperator(currentUser.getId());
         cmRefundShop.setOperatTime(time);
         cmRefundShop.setDelFlag("0");
-        if (cmRefundShop.getRefundWay().equals("11,22")) {
+        if (cmRefundShop.getRefundBalanceAmount() > 0d && cmRefundShop.getRefundAmount() > 0d) {
             cmRefundShop.setRefundWay("3");
-        } else if (cmRefundShop.getRefundWay().equals("11")) {
-            cmRefundShop.setRefundBalanceAmount(0d);
-            cmRefundShop.setRefundWay("1");
-        } else if (cmRefundShop.getRefundWay().equals("22")) {
+            cmRefundShop.setRefundType("6");
+        } else if (cmRefundShop.getRefundBalanceAmount() > 0d) {
+            // 欠款账簿
             cmRefundShop.setRefundAmount(0d);
             cmRefundShop.setRefundWay("2");
+        } else if (cmRefundShop.getRefundAmount() > 0d) {
+            // 虚拟银行
+            cmRefundShop.setRefundBalanceAmount(0d);
+            cmRefundShop.setRefundWay("1");
+            cmRefundShop.setRefundType("6");
         }
         cmRefundShopDao.insert(cmRefundShop);
         //  shopOrderInfo 的格式是这样的: 子订单ID_退款金额

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

@@ -694,6 +694,9 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             shopOrder.setShopProductAmount(totalCostFee.doubleValue());
             // 应付税费
             shopOrder.setShopTaxFee(shopTaxFee.doubleValue());
+            if (null == shopOrder.getShopPostFee()) {
+                shopOrder.setShopPostFee(0D);
+            }
             // 付供应商
             double shouldPayShopAmount = shopOrder.getShopProductAmount() + shopOrder.getShopPostFee() + shopOrder.getShopTaxFee();
             shopOrder.setShouldPayShopAmount(shouldPayShopAmount);

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

@@ -1811,8 +1811,11 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             orderIdsInApplyReturn = cmReturnedPurchaseDao.findOrderIDsInApplyReturnFlag(oId);
         }
         for (NewOrder order : results) {
+            Double ableUserMoney = 0d;
             CmUser user = cmUserDao.get(order.getUserID().toString());
-            Double ableUserMoney = user.getAbleUserMoney() == null ? 0d : user.getAbleUserMoney();
+            if (null != user && null != user.getAbleUserMoney()){
+                ableUserMoney = user.getAbleUserMoney();
+            }
             order.setAbleUserMoney(ableUserMoney);
             if ((orderIds != null && orderIds.contains(order.getOrderID())) || "1".equals(order.getRebateFlag())) {
                 order.setRebateOrder("1");

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

@@ -726,7 +726,7 @@
         on cror.orderID = cso.shopOrderID
         LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
         where cror.relationType = '1' and cror.delFlag = '0' AND cdr.receiptStatus = '2'
-        and cso.orderID in
+        and cdr.receiptType = '3' and cso.orderID in
         <foreach collection="orderIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>

src/main/webapp/WEB-INF/views/modules/basesetting/helpPageEdit.jsp

@@ -87,7 +87,7 @@
     </table>
 </form:form>
 <!-- 富文本编辑器 -->
-<% request.setAttribute("caimeiSpi", Global.getConfig("caimei.spi"));%>
+
 <% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
 <script type="text/javascript" src="${ctxStatic}/ckeditor5-new/ckeditor.js"></script>
 <script type="text/javascript">
@@ -103,7 +103,7 @@
 		// CKEDITOR.replace('content');
         ClassicEditor.create(document.querySelector('#contentEditor'), {
             ckfinder: {
-                uploadUrl: '${caimeiSpi}/formData/ckeditorImage'
+                uploadUrl: '${caimeiCore}/tools/image/upload/ckeditor'
             }
         }).then(function(editor) {
             window.contentEditor = editor;

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageList.jsp

@@ -1,7 +1,7 @@
 <%@ page import="com.thinkgem.jeesite.common.config.Global" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
-<% request.setAttribute("caimeiSpi", Global.getConfig("caimei.spi"));%>
+
 <% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
 <html>
 <head>

src/main/webapp/WEB-INF/views/modules/info/infoForm.jsp

@@ -152,7 +152,7 @@
 		</div>
 	</form:form>
 <!-- 富文本编辑器 -->
-<% request.setAttribute("caimeiSpi", Global.getConfig("caimei.spi"));%>
+
 <% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
 <script type="text/javascript" src="${ctxStatic}/ckeditor5-new/ckeditor.js"></script>
 <script type="text/javascript">
@@ -160,7 +160,7 @@
 			//富文本框
 			ClassicEditor.create(document.querySelector('#infoContentEditor'), {
 				ckfinder: {
-					uploadUrl: '${caimeiSpi}/formData/ckeditorImage'
+					uploadUrl: '${caimeiCore}/tools/image/upload/ckeditor'
 				}
 			}).then(function(editor) {
 				window.infoContentEditor = editor;

src/main/webapp/WEB-INF/views/modules/info/infoList.jsp

@@ -15,7 +15,7 @@
 		background-color: white;
 	}
 	</style>
-	<% request.setAttribute("caimeiSpi", Global.getConfig("caimei.spi"));%>
+
 <% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
 	<script type="text/javascript">
 		$(document).ready(function() {

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

@@ -248,28 +248,25 @@
 				</div>
 				<div class="refund-methods">
 					<label>接收退款方式：</label>
-					<div>
-						<%--<div class="refund-wrapper">
-							<input type="checkbox" class="refund-checkbox" name="refundWay" value="11" checked>线下转账&nbsp
-							<select name="refundType" id="">
-								&lt;%&ndash;<option value="6">账户余额</option>&ndash;%&gt;
-								<option value="1">建设银行7297</option>
-								<option value="2">中信银行0897</option>
-								<option value="3">中信银行7172</option>
-								<option value="4">广发银行0115</option>
-								<option value="5">广发银行5461</option>
-								<option value="6">虚拟银行0000</option>
-							</select>
-							<input type="number" name="refundAmount" class="refund-amount" value="0.00">
-						</div>--%>
-						<div class="refund-wrapper">
-							<%--<input type="checkbox" class="refund-checkbox" name="refundWay" value="22" checked>--%>
-								欠款账簿
-								<input type="hidden" name="refundBalanceAmount" class="refund-amount" value="0.00">
-								<input type="hidden" name="refundWay" value="22">
-								<span id="refundBalanceAmount">0.00</span>
-						</div>
-						<input type="hidden" name="shopID" value="${cmRefundShop.shopID}">
+					<div class="refund-wrapper">
+						欠款账簿
+						<input type="number" name="refundBalanceAmount" id="refundBalanceAmount" class="refund-amount" value="0">
+						<br>
+						虚拟银行
+						<input type="number" name="refundAmount" id="refundAmount" class="refund-amount" value="0">
+					</div>
+					<%--<div class="refund-wrapper">
+						<select name="refundType" id="">
+							&lt;%&ndash;<option value="6">账户余额</option>&ndash;%&gt;
+							<option value="1">建设银行7297</option>
+							<option value="2">中信银行0897</option>
+							<option value="3">中信银行7172</option>
+							<option value="4">广发银行0115</option>
+							<option value="5">广发银行5461</option>
+							<option value="6">虚拟银行0000</option>
+						</select>
+					</div>--%>
+					<input type="hidden" name="shopID" value="${cmRefundShop.shopID}">
 					</div>
 				</div>
 				<div class="remark-wrapper">
@@ -356,20 +353,44 @@
 				$('.refund').each(function (index, ele) {
 					totalAmount+= Number($(this).val());
 				});
-				$('#totalRefundAmount').text(totalAmount);
-				$('#refundBalanceAmount').text(totalAmount);
-				$('#totalRefundAmount-hidden').val(totalAmount);
-				$('.refund-amount').val(totalAmount);
+				$('#totalRefundAmount').text(totalAmount.toFixed(2));
+				$('#refundBalanceAmount').val(totalAmount);
+				/*$('#totalRefundAmount-hidden').val(totalAmount);
+				$('.refund-amount').val(totalAmount);*/
 				var refundInfo = wrapper.find('.refundInfo');
 				refundInfo.val(refundInfo.attr('data-shoporderid') + '_' + thisVal);
 			});
-
-			/*$('.refund-amount').on('input',function() {
-			    var thisVal = $(this).val();
-			    if(thisVal < 0) {
-                    $(this).val(0);
+			$('body').on('input propertychange','#refundBalanceAmount',function() {
+				var thisVal = $(this).val()*1;
+				var totalAmount = $('#totalRefundAmount').text()*1;
+				if (thisVal > totalAmount) {
+					alertx("金额不能大于退款总金额", function(){
+						$('#refundBalanceAmount').val(totalAmount);
+						$('#refundAmount').val(0);
+					});
+				} else {
+					if(thisVal < 0) {
+						$(this).val(0);
+					}
+					var totalAmount = $('#totalRefundAmount').text()*1;
+					$('#refundAmount').val(totalAmount - thisVal);
 				}
-			})*/
+			});
+			$('body').on('input propertychange','#refundAmount',function() {
+				var thisVal = $(this).val()*1;
+				var totalAmount = $('#totalRefundAmount').text()*1;
+				if (thisVal > totalAmount) {
+					alertx("金额不能大于退款总金额",function(){
+						$('#refundAmount').val(totalAmount);
+						$('#refundBalanceAmount').val(0);
+					});
+				} else {
+					if(thisVal < 0) {
+						$(this).val(0);
+					}
+					$('#refundBalanceAmount').val(totalAmount - thisVal);
+				}
+			});
 
 			function showTips(title,text) {
 				$('.tips-popup h4').text(title);

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -409,7 +409,7 @@
     </table>
 </form:form>
 <!-- 富文本编辑器 -->
-<% request.setAttribute("caimeiSpi", Global.getConfig("caimei.spi"));%>
+
 <% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
 <script type="text/javascript" src="${ctxStatic}/ckeditor5-new/ckeditor.js"></script>
 <script type="text/javascript">
@@ -606,7 +606,7 @@
 		//富文本框
         ClassicEditor.create(document.querySelector('#detailInfoEditor'), {
             ckfinder: {
-                uploadUrl: '${caimeiSpi}/formData/ckeditorImage'
+                uploadUrl: '${caimeiCore}/tools/image/upload/ckeditor'
             }
         }).then(function(editor) {
             window.detailInfoEditor = editor;
@@ -615,7 +615,7 @@
         });
         ClassicEditor.create(document.querySelector('#orderInfoEditor'), {
             ckfinder: {
-                uploadUrl: '${caimeiSpi}/formData/ckeditorImage'
+                uploadUrl: '${caimeiCore}/tools/image/upload/ckeditor'
             }
         }).then(function(editor) {
             window.orderInfoEditor = editor;
@@ -624,7 +624,7 @@
         });
         ClassicEditor.create(document.querySelector('#serviceInfoEditor'), {
             ckfinder: {
-                uploadUrl: '${caimeiSpi}/formData/ckeditorImage'
+                uploadUrl: '${caimeiCore}/tools/image/upload/ckeditor'
             }
         }).then(function(editor) {
             window.serviceInfoEditor = editor;

src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -338,7 +338,7 @@
 		</div>
 	</div>
 	<div class="pagination">${page}</div>
-<% request.setAttribute("caimeiSpi", Global.getConfig("caimei.spi"));%>
+
 <% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
 <script type="text/javascript">
 	var num = '';

src/main/webapp/WEB-INF/views/modules/product-new/secondHand.jsp

@@ -296,7 +296,7 @@
     </tbody>
 </table>
 <div class="pagination">${page}</div>
-<% request.setAttribute("caimeiSpi", Global.getConfig("caimei.spi"));%>
+
 <% request.setAttribute("caimeiCore", Global.getConfig("caimei.core"));%>
 <script type="text/javascript">
     var num = '';