zyn / cjs-site

Go to a project
Toggle navigation Toggle navigation pinning
bruce
f848facf 1 parent 7cc791ef

仓管费

Inline Side-by-side
Showing 5 changed files with 43 additions and 22 deletions
......@@ -198,16 +198,14 @@ public class PickAction {
}
BigDecimal totalAmount = new BigDecimal("0.01").multiply(new BigDecimal(trusteeshipCycle)).
multiply(new BigDecimal(pickTotal));
if ("1".equals(pickType)){//上门自提
if ("01".equals(pickType)){//本人自提
pickInfo = (OutpropApplyPickInfo)session.getAttribute("pickInfo");
if (pickInfo.getPickType().equals("01")){
UserInfo userInfo = (UserInfo)session.getAttribute("USER_INFO");
model.addAttribute("pickName", userInfo.getClient_id());
pickInfo.setPickType("0");
}else {
pickInfo.setPickType("1");
model.addAttribute("pickName", pickInfo.getDelegateName());
}
UserInfo userInfo = (UserInfo)session.getAttribute("USER_INFO");
model.addAttribute("pickName", userInfo.getClient_id());
pickInfo.setPickType("0");
}else if ("02".equals(pickType)){//委托他人
pickInfo.setPickType("1");
model.addAttribute("pickName", pickInfo.getDelegateName());
}else if ("2".equals(pickType)){//顺丰到付
pickInfo.setPickType(pickType);
pickInfo.setCreateDate(String.valueOf(addressId));
......
......@@ -218,7 +218,7 @@ public class PickBiz {
applyInfo.setPickType("01");
applyInfo.setPhoneCode(clientInfo.getMobileTel());
resultInfo = this.pick(pickInfo, applyInfo);
resultInfo = this.pickNew(pickInfo, applyInfo);
if (resultInfo.getCode() != 0) {
if (StringUtils.isBlank(warehouseCode)) {
warehousePickDate += " 9:00-16:00";
......@@ -361,7 +361,18 @@ public class PickBiz {
} catch (ServiceException e) {
return new ResultInfo(0, e.getMessage());
}
return new ResultInfo(-1,"");
//提货详细信息
ClientInfo clientInfo = clientInfoDao.queryByClientId(pickInfo.getClientId());
OutpropApplyInfo applyInfo = new OutpropApplyInfo();
applyInfo.setPickType("01");
applyInfo.setPhoneCode(clientInfo.getMobileTel());
applyInfo.setPickingName(clientInfo.getClientName());
applyInfo.setExpressAddress("转赵涌在线：" + pickInfo.getZhaoonlineId());
pickInfo.setZhaoonlineId(pickInfo.getZhaoonlineId());
pickInfo.setPickType("3");
pickInfo.setInsurance(0);
pickInfo.setPickDate(this.createPickDate(""));
return this.pickNew(pickInfo, applyInfo);
}
/**转赵涌在线拍卖*/
......
......@@ -24,7 +24,8 @@
init: function() {
this.bind();
this.render();
this.countdown=10;
this.countdown = 120;
this.count = 1;
},
bind: function() {
$(document).on('click', '#payBtn', this.showPayDialog);
......@@ -58,13 +59,17 @@
htmlStr += data.totalAmount + '元'
htmlStr += '</div>'
htmlStr += '<div style="width: 200px;height: 200px;margin: 0 auto;">'
htmlStr += '<div style="width:100%;height:100%;" id="qrcode"></div>'
htmlStr += '<div style="width:100%;height:100%;position: relative;" id="qrcode"></div>'
htmlStr += '</div>'
htmlStr += '<div style="width:100%;height:30px;font-size:16px;text-align:center;padding-top:30px;">'
htmlStr += '付款码每2分钟刷新一次，请在规定时间内完成付款'
htmlStr += '</div>'
$('#payDialogContent').html(htmlStr);
var qrcode = new QRCode(document.getElementById("qrcode"));
var qrcode = new QRCode(document.getElementById("qrcode"),{
width : 200,
height : 200,
background : "#ffffff"
});
qrcode.clear();
qrcode.makeCode(data.qrCode);
Pay._timer();
......@@ -76,16 +81,23 @@
},
_timer:function(){
if (Pay.countdown == 0) {
if (Pay.count > 5){
return;
}
$.ajax({
type: "get",
url: "/pick/pay/createOrder",
success : function(data){
if(data.code){
Pay.countdown = 120;
var qrcode = new QRCode(document.getElementById("qrcode"));
var qrcode = new QRCode(document.getElementById("qrcode"),{
width : 200,
height : 200,
background : "#ffffff"
});
qrcode.clear();
qrcode.makeCode(data.qrCode);
Pay._timer();
Pay.count++;
}else{
layer.msg(data.msg, {icon: '2'});
}
......@@ -104,7 +116,7 @@
});
</script>
<style>
#qrcode img { width: 100%; }
#qrcode img { position: absolute;top: 0;left:0;background-color: #fff; width: 100%; }
</style>
</head>
<body>
......@@ -126,7 +138,7 @@
</div>
<div style="display: inline-block;vertical-align: top;width: 500px;">
<c:if test="${pickInfo.pickType == 0}">上门自提</c:if>
<c:if test="${pickInfo.pickType == 1}">委托自提</c:if>
<c:if test="${pickInfo.pickType == 1}">委托他人</c:if>
<c:if test="${pickInfo.pickType == 2}">顺丰到付</c:if>
<c:if test="${pickInfo.pickType == 3}">转赵涌在线</c:if>
</div>
......
......@@ -150,7 +150,7 @@
<td rowspan="${fn:length(pick.applyList) }">
<p> ${apply.pickStatusName }</p>
<c:if test="${apply.pickStatus == '0' }">
<a onclick="ensure('${pick.pickNo}')">取消提货</a>
<%--<a onclick="ensure('${pick.pickNo}')">取消提货</a>--%>
</c:if>
</td>
</tr>
......@@ -179,7 +179,7 @@
<td rowspan="${fn:length(pick.applyList) }">
<p>${apply.pickStatusName }</p>
<c:if test="${apply.pickStatus == '0' }">
<a onclick="ensure(${pick.pickNo})">取消提货</a>
<%--<a onclick="ensure(${pick.pickNo})">取消提货</a>--%>
</c:if>
</td>
</tr>
......@@ -239,7 +239,7 @@
<td rowspan="${fn:length(pick.applyList) }">
<p>${apply.pickStatusName }</p>
<c:if test="${apply.pickStatus == '0' }">
<a onclick="ensure(${pick.pickNo})">取消提货</a>
<%--<a onclick="ensure(${pick.pickNo})">取消提货</a>--%>
</c:if>
<c:if test="${apply.pickStatus == '3' }">
<div style="position: relative;">
......
......@@ -41,7 +41,7 @@
<h4>填写相关信息</h4>
<div class="content-msg">
<div class="input-box">
<form id="pickForm" action="${ctx }/user/pick/self" method="post">
<form id="pickForm" action="${ctx }/user/pick/payInfo" method="post">
<p>
<span>提货人：</span>
<label><input type="radio" name="pickType" checked="checked" value="01" />本人自提</label>
......