Browse Source

线下转账信息bugfix

kaick 1 year ago
parent
commit
411c573ae6

+ 4 - 4
src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -496,10 +496,10 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
             //保存每个子订单的付款金额记录  等待审核付款
             NewCmShop shop = newCmShopDao.get(cmPayShop.getShopID());
             shop.setAbleRebateAmount(shop.getAbleRebateAmount() == null ? 0D : shop.getAbleRebateAmount() - cmPayShop.getBalancePayFee());
-            shop.setBankAccount(cmPayShop.getBankAccount());
-            shop.setBankAccountName(cmPayShop.getBankAccountName());
-            shop.setBankName(cmPayShop.getBankName());
-            newCmShopDao.update(shop);
+//            shop.setBankAccount(cmPayShop.getBankAccount());
+//            shop.setBankAccountName(cmPayShop.getBankAccountName());
+//            shop.setBankName(cmPayShop.getBankName());
+//            newCmShopDao.update(shop);
             Integer orderID = null;//记录一下子订单的id 下面需要用它去查询运费子订单
             for (String p : payInfo) {
                 CmPayShopRecord record = new CmPayShopRecord();

+ 9 - 0
src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -1008,6 +1008,15 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
         orderProduct.setProductImage(AppUtils.getProductImageURL(orderProduct.getProductImage(), AppKeys.ORIGINAL_PICTURE, domain));
         if (orderProduct != null && orderProduct.getOrderPromotionsId() != null && orderProduct.getOrderPromotionsId() > 0) {
             orderProduct.setProductPromotion(cmPromotionDao.findOrderPromotions(orderProduct.getOrderPromotionsId()));
+            //单品优惠
+            if (orderProduct.getOrderPromotionsId() != null) {
+                CmPromotion promotions = cmPromotionDao.findOrderPromotions(orderProduct.getOrderPromotionsId());
+                if (promotions != null && "1".equals(promotions.getMode())) {
+                    //取对应sku的优惠价
+                    Double price = productDao.getTouchPriceBySku(orderProduct.getSkuId());
+                    orderProduct.setDiscountPrice(price);
+                }
+            }
         }
     }
 }

+ 27 - 0
src/main/java/com/caimei/modules/user/entity/NewCmShop.java

@@ -96,6 +96,33 @@ public class NewCmShop extends DataEntity<NewCmShop> {
     private String endTime;        //注册时间结束  查询条件
     private String editStatus;//1编辑,2审核
     private String source; //注册来源: 0网站 1小程序
+    private String cmBankAccount; //付采美银行账号
+    private String cmBankAccountName; //采美付款账号的户名
+    private String cmBankName; //采美付款账号的开户行
+
+    public String getCmBankAccount() {
+        return cmBankAccount;
+    }
+
+    public void setCmBankAccount(String cmBankAccount) {
+        this.cmBankAccount = cmBankAccount;
+    }
+
+    public String getCmBankAccountName() {
+        return cmBankAccountName;
+    }
+
+    public void setCmBankAccountName(String cmBankAccountName) {
+        this.cmBankAccountName = cmBankAccountName;
+    }
+
+    public String getCmBankName() {
+        return cmBankName;
+    }
+
+    public void setCmBankName(String cmBankName) {
+        this.cmBankName = cmBankName;
+    }
 
     public NewCmShop() {
         super();

+ 4 - 0
src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -192,6 +192,10 @@ public class NewCmShopController extends BaseController {
     public String formShop(NewCmShop newCmShop, Model model) {
         //获取供应商证书信息
         newCmShop = newCmShopService.get(newCmShop.getShopID().toString());
+        //去除银行账号空格
+        if(newCmShop!=null&&newCmShop.getBankAccount()!=null){
+            newCmShop.setBankAccount(newCmShop.getBankAccount().replaceAll(" ",""));
+        }
         model.addAttribute("newCmShop", newCmShop);
         return "modules/user/newCmShopSetForm";
     }

+ 21 - 0
src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -54,6 +54,9 @@
 		a.rebateAmount AS "rebateAmount",
 		a.bankAccountName AS "bankAccountName",
 		a.bankName AS "bankName",
+        a.cmBankAccount AS "cmBankAccount",
+		a.cmBankAccountName AS "cmBankAccountName",
+		a.cmBankName AS "cmBankName",
         a.AccountOwnership as AccountOwnership,
 		a.socialCreditCode AS "socialCreditCode",
 		u.email,
@@ -389,6 +392,16 @@
             <if test="bankName != null">
                 bankName=#{bankName},
             </if>
+            <if test="cmBankName != null">
+                cmBankName=#{cmBankName},
+            </if>
+            <if test="cmBankAccountName != null">
+                cmBankAccountName=#{cmBankAccountName},
+            </if>
+            <if test="cmBankAccount != null">
+                cmBankAccount=#{cmBankAccount},
+            </if>
+
             <if test="socialCreditCode != null">
                 socialCreditCode = #{socialCreditCode}
             </if>
@@ -575,6 +588,10 @@
         <result property="bankAccount"    column="bankAccount"    />
         <result property="bankAccountName"    column="bankAccountName"    />
         <result property="bankName"    column="bankName"    />
+        <result property="cmBankName"    column="cmBankName"    />
+        <result property="cmBankAccountName"    column="cmBankAccountName"    />
+        <result property="cmBankAccount"    column="cmBankAccount"    />
+
         <result property="checkMan"    column="checkMan"    />
         <result property="ableRebateAmount"    column="ableRebateAmount"    />
         <result property="website"    column="website"    />
@@ -635,7 +652,11 @@
             <if test="medicalPracticeLicenseImg3 != null and medicalPracticeLicenseImg3 != ''">medicalPracticeLicenseImg3 = #{medicalPracticeLicenseImg3},</if>
             <if test="bankAccount != null and bankAccount != ''">bankAccount = #{bankAccount},</if>
             <if test="bankAccountName != null and bankAccountName != ''">bankAccountName = #{bankAccountName},</if>
+            <if test="cmBankName != null and cmBankName != ''">cmBankName = #{cmBankName},</if>
+            <if test="cmBankAccountName != null and cmBankAccountName != ''">cmBankAccountName = #{cmBankAccountName},</if>
+            <if test="cmBankAccount != null and cmBankAccount != ''">cmBankAccount = #{cmBankAccount},</if>
             <if test="bankName != null and bankName != ''">bankName = #{bankName},</if>
+
             <if test="checkMan != null and checkMan != ''">checkMan = #{checkMan},</if>
             <if test="ableRebateAmount != null">ableRebateAmount = #{ableRebateAmount},</if>
             <if test="website != null and website != ''">website = #{website},</if>

+ 84 - 22
src/main/webapp/WEB-INF/views/modules/user/newCmShopSetForm.jsp

@@ -5,17 +5,32 @@
 	<title>组织列表管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
-		$(document).ready(function() {
+		$(document).ready(function () {
+			accountOwnershipCheck()
+
 			//$("#name").focus();
 			$("#inputForm").validate({
-				submitHandler: function(form){
+				submitHandler: function (form) {
+					// if ($('#bankAccount').val() == "" || $('#bankAccountName').val() == "" || $('#bankName').val() == "") {
+					// 	if (!confirm('您还没填写供应商的账号归属,确定不填写了吗?')) {
+					// 		$('#AccountOwnership').val("1")
+					// 		accountOwnershipCheck()
+					// 		return false
+					// 	}
+					// } else if ($('#cmBankAccount').val() == "" || $('#cmBankAccountName').val() == "" || $('#cmBankName').val() == "") {
+					// 	if (!confirm('您还没填写付采美的账号归属,确定不填写了吗?')) {
+					// 		$('#AccountOwnership').val("0")
+					// 		accountOwnershipCheck()
+					// 		return false
+					// 	}
+					// }
 					loading('正在提交,请稍等...');
 					form.submit();
 				},
 				errorContainer: "#messageBox",
-				errorPlacement: function(error, element) {
+				errorPlacement: function (error, element) {
 					$("#messageBox").text("输入有误,请先更正。");
-					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+					if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
 						error.appendTo(element.parent().parent());
 					} else {
 						error.insertAfter(element);
@@ -24,6 +39,22 @@
 			});
 		});
 
+		function accountOwnershipCheck() {
+			if ($('#AccountOwnership').val() == 1) {
+				$('#AccountOwnership1').show()
+				$('#AccountOwnership0').hide()
+				// $('#bankAccount').val("")
+				// $('#bankAccountName').val("")
+				// $('#bankName').val("")
+			} else {
+				$('#AccountOwnership0').show()
+				$('#AccountOwnership1').hide()
+				// $('#cmBankAccount').val("")
+				// $('#cmBankAccountName').val("")
+				// $('#cmBankName').val("")
+			}
+		}
+
 	</script>
 </head>
 <body>
@@ -31,42 +62,73 @@
 	<li><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
 	<li class="active"><a href="${ctx}/user/newCmShop/formShop?shopID=${newCmShop.shopID}">线下转账信息</a></li>
 </ul><br/>
-	<form:form id="inputForm" modelAttribute="newCmShop" action="${ctx}/user/newCmShop/updateShop" method="post" class="form-horizontal">
-		<form:hidden path="shopID"/>
-		<sys:message content="${message}"/>
-		<div class="control-group">
-			<label class="control-label"><font color="red">*</font>账号归属:</label>
-			<div class="controls">
-				<form:select path="AccountOwnership" placeholder="请选择" class="input-xlarge required">
-					<form:option value="0" label="采美" />
-					<form:option value="1" label="供应商" />
-				</form:select>
-			</div>
+<form:form id="inputForm" modelAttribute="newCmShop" action="${ctx}/user/newCmShop/updateShop" method="post"
+		   class="form-horizontal">
+	<form:hidden path="shopID"/>
+	<sys:message content="${message}"/>
+	<div class="control-group">
+		<label class="control-label"><font color="red">*</font>账号归属:</label>
+		<div class="controls">
+			<form:select path="AccountOwnership" placeholder="请选择" class="input-xlarge required"
+						 onchange="accountOwnershipCheck()">
+				<form:option value="0" label="采美"/>
+				<form:option value="1" label="供应商"/>
+			</form:select>
 		</div>
+	</div>
+	<div id="AccountOwnership1">
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>开户行:</label>
 			<div class="controls">
-				<form:input path="bankName" placeholder="请输入开户行" htmlEscape="false" maxlength="30" class="input-xlarge required"/>
+				<form:input path="bankName" placeholder="请输入开户行" htmlEscape="false" maxlength="30"
+							class="input-xlarge required"/>
 			</div>
 		</div>
 
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>银行卡号:</label>
 			<div class="controls">
-				<form:input  path="bankAccount" placeholder="请输入银行卡号" htmlEscape="false" type="number" maxlength="30" class="input-xlarge required"/>
+				<form:input path="bankAccount" placeholder="请输入银行卡号" htmlEscape="false" type="number" maxlength="30"
+							class="input-xlarge required"/>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>户名:</label>
 			<div class="controls">
-				<form:input path="bankAccountName" placeholder="请输入开户行" htmlEscape="false" maxlength="30"  class="input-xlarge required"/>
+				<form:input path="bankAccountName" placeholder="请输入开户行" htmlEscape="false" maxlength="30"
+							class="input-xlarge required"/>
+			</div>
+		</div>
+	</div>
+	<div id="AccountOwnership0">
+		<div class="control-group">
+			<label class="control-label"><font color="red">*</font>付采美开户行:</label>
+			<div class="controls">
+				<form:input path="cmBankName" placeholder="请输入开户行" htmlEscape="false" maxlength="30"
+							class="input-xlarge required"/>
 			</div>
 		</div>
 
-		<div class="form-actions">
-			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
-			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+		<div class="control-group">
+			<label class="control-label"><font color="red">*</font>付采美银行卡号:</label>
+			<div class="controls">
+				<form:input path="cmBankAccount" placeholder="请输入银行卡号" htmlEscape="false" type="number" maxlength="30"
+							class="input-xlarge required"/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><font color="red">*</font>付采美户名:</label>
+			<div class="controls">
+				<form:input path="cmBankAccountName" placeholder="请输入开户行" htmlEscape="false" maxlength="30"
+							class="input-xlarge required"/>
+			</div>
 		</div>
-	</form:form>
+	</div>
+
+	<div class="form-actions">
+		<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
+		<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+	</div>
+</form:form>
 </body>
 </html>

+ 114 - 87
src/main/webapp/static/common/jeesite.js

@@ -1,6 +1,6 @@
 /*!
  * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
- * 
+ *
  * 通用公共方法
  * @author ThinkGem
  * @version 2014-4-29
@@ -38,13 +38,14 @@ function include(id, path, file){
 // 获取URL地址参数
 function getQueryString(name, url) {
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-    if (!url || url == ""){
-	    url = window.location.search;
-    }else{	
-    	url = url.substring(url.indexOf("?"));
+    if (!url || url == "") {
+        url = window.location.search;
+    } else {
+        url = url.substring(url.indexOf("?"));
     }
     r = url.substr(1).match(reg)
-    if (r != null) return unescape(r[2]); return null;
+    if (r != null) return unescape(r[2]);
+    return null;
 }
 
 //获取字典标签
@@ -77,12 +78,14 @@ function closeTip(){
 }
 
 //显示提示框
-function showTip(mess, type, timeout, lazytime){
-	resetTip();
-	setTimeout(function(){
-		top.$.jBox.tip(mess, (type == undefined || type == '' ? 'info' : type), {opacity:0, 
-			timeout:  timeout == undefined ? 2000 : timeout});
-	}, lazytime == undefined ? 500 : lazytime);
+function showTip(mess, type, timeout, lazytime) {
+    resetTip();
+    setTimeout(function () {
+        top.$.jBox.tip(mess, (type == undefined || type == '' ? 'info' : type), {
+            opacity: 0,
+            timeout: timeout == undefined ? 2000 : timeout
+        });
+    }, lazytime == undefined ? 500 : lazytime);
 }
 
 // 显示加载框
@@ -107,31 +110,55 @@ function alertx(mess, closed){
 // 确认对话框
 function confirmx(mess, href, closed){
 	top.$.jBox.confirm(mess,'系统提示',function(v,h,f){
-		if(v=='ok'){
-			if (typeof href == 'function') {
-				href();
-			}else{
-				resetTip(); //loading();
-				location = href;
-			}
-		}
-	},{buttonsFocus:1, closed:function(){
-		if (typeof closed == 'function') {
-			closed();
-		}
-	}});
-	top.$('.jbox-body .jbox-icon').css('top','55px');
-	return false;
+		if(v=='ok') {
+            if (href != null) {
+                if (typeof href == 'function') {
+                    href();
+                } else {
+                    resetTip(); //loading();
+                    location = href;
+                }
+            } else {
+                return true
+            }
+        }
+    }, {
+        buttonsFocus: 1, closed: function () {
+            if (typeof closed == 'function') {
+                closed();
+            }
+        }
+    });
+    top.$('.jbox-body .jbox-icon').css('top', '55px');
+    return false;
+}
+
+// 确认对话框
+function confirmF(mess, closed) {
+    top.$.jBox.confirm(mess, '系统提示', function (v, h, f) {
+        if (v == 'ok') {
+            return true
+        }
+    }, {
+        buttonsFocus: 1, closed: function () {
+            if (typeof closed == 'function') {
+                closed();
+            }
+        }
+    });
+    top.$('.jbox-body .jbox-icon').css('top', '55px');
+    return false;
 }
 
+
 // 提示输入对话框
-function promptx(title, lable, href, closed){
-	top.$.jBox("<div class='form-search' style='padding:20px;text-align:center;'>" + lable + ":<input type='text' id='txt' name='txt'/></div>", {
-			title: title, submit: function (v, h, f){
-	    if (f.txt == '') {
-	        top.$.jBox.tip("请输入" + lable + "。", 'error');
-	        return false;
-	    }
+function promptx(title, lable, href, closed) {
+    top.$.jBox("<div class='form-search' style='padding:20px;text-align:center;'>" + lable + ":<input type='text' id='txt' name='txt'/></div>", {
+        title: title, submit: function (v, h, f) {
+            if (f.txt == '') {
+                top.$.jBox.tip("请输入" + lable + "。", 'error');
+                return false;
+            }
 		if (typeof href == 'function') {
 			href();
 		}else{
@@ -215,60 +242,60 @@ function strToDate(date){
 }
 
 // 日期加减
-function addDate(date, dadd){  
-	date = date.valueOf();
-	date = date + dadd * 24 * 60 * 60 * 1000;
-	return new Date(date);  
+function addDate(date, dadd) {
+    date = date.valueOf();
+    date = date + dadd * 24 * 60 * 60 * 1000;
+    return new Date(date);
 }
 
 //截取字符串,区别汉字和英文
-function abbr(name, maxLength){  
- if(!maxLength){  
-     maxLength = 20;  
- }  
- if(name==null||name.length<1){  
-     return "";  
- }  
- var w = 0;//字符串长度,一个汉字长度为2   
- var s = 0;//汉字个数   
- var p = false;//判断字符串当前循环的前一个字符是否为汉字   
- var b = false;//判断字符串当前循环的字符是否为汉字   
- var nameSub;  
- for (var i=0; i<name.length; i++) {  
-    if(i>1 && b==false){  
-         p = false;  
-    }  
-    if(i>1 && b==true){  
-         p = true;  
-    }  
-    var c = name.charCodeAt(i);  
-    //单字节加1   
-    if ((c >= 0x0001 && c <= 0x007e) || (0xff60<=c && c<=0xff9f)) {  
-         w++;  
-         b = false;  
-    }else {  
-         w+=2;  
-         s++;  
-         b = true;  
-    }  
-    if(w>maxLength && i<=name.length-1){  
-         if(b==true && p==true){  
-             nameSub = name.substring(0,i-2)+"...";  
-         }  
-         if(b==false && p==false){  
-             nameSub = name.substring(0,i-3)+"...";  
-         }  
-         if(b==true && p==false){  
-             nameSub = name.substring(0,i-2)+"...";  
-         }  
-         if(p==true){  
-             nameSub = name.substring(0,i-2)+"...";  
-         }  
-         break;  
-    }  
- }  
- if(w<=maxLength){  
-     return name;  
- }  
- return nameSub;  
+function abbr(name, maxLength) {
+    if (!maxLength) {
+        maxLength = 20;
+    }
+    if (name == null || name.length < 1) {
+        return "";
+    }
+    var w = 0;//字符串长度,一个汉字长度为2
+    var s = 0;//汉字个数
+    var p = false;//判断字符串当前循环的前一个字符是否为汉字
+    var b = false;//判断字符串当前循环的字符是否为汉字
+    var nameSub;
+    for (var i = 0; i < name.length; i++) {
+        if (i > 1 && b == false) {
+            p = false;
+        }
+        if (i > 1 && b == true) {
+            p = true;
+        }
+        var c = name.charCodeAt(i);
+        //单字节加1
+        if ((c >= 0x0001 && c <= 0x007e) || (0xff60 <= c && c <= 0xff9f)) {
+            w++;
+            b = false;
+        } else {
+            w += 2;
+            s++;
+            b = true;
+        }
+        if (w > maxLength && i <= name.length - 1) {
+            if (b == true && p == true) {
+                nameSub = name.substring(0, i - 2) + "...";
+            }
+            if (b == false && p == false) {
+                nameSub = name.substring(0, i - 3) + "...";
+            }
+            if (b == true && p == false) {
+                nameSub = name.substring(0, i - 2) + "...";
+            }
+            if (p == true) {
+                nameSub = name.substring(0, i - 2) + "...";
+            }
+            break;
+        }
+    }
+    if (w <= maxLength) {
+        return name;
+    }
+    return nameSub;
 }