zyn / cjs-site

Go to a project
Toggle navigation Toggle navigation pinning
wangbeiyong
2157b7d8 1 parent b6da44e6

43

Inline Side-by-side
Showing 4 changed files with 12 additions and 5 deletions
...@@ -198,8 +198,12 @@ public class PickAction { ...@@ -198,8 +198,12 @@ public class PickAction {
198 } 198 }
199 BigDecimal totalAmount = new BigDecimal("0.01").multiply(new BigDecimal(trusteeshipCycle)). 199 BigDecimal totalAmount = new BigDecimal("0.01").multiply(new BigDecimal(trusteeshipCycle)).
200 multiply(new BigDecimal(pickTotal)); 200 multiply(new BigDecimal(pickTotal));
201 - if ("01".equals(pickType)){//本人自提 201 + //80022109 钱勋 申请提货，经公司研究决定，给予该客户免除仓费的优惠，包装费正常收取，请技术协助处理一下，谢谢，以便客户尽快能完成提货相关手续。
202 + if("80022109".equals(ActionUtil.getUser().getUserId())){
203 + totalAmount= BigDecimal.ZERO;
204 + }
202 UserInfo userInfo = (UserInfo)session.getAttribute("USER_INFO"); 205 UserInfo userInfo = (UserInfo)session.getAttribute("USER_INFO");
206 + if ("01".equals(pickType)){//本人自提
203 model.addAttribute("pickName", userInfo.getClient_id()); 207 model.addAttribute("pickName", userInfo.getClient_id());
204 pickInfo.setPickType("0"); 208 pickInfo.setPickType("0");
205 }else if ("02".equals(pickType)){//委托他人 209 }else if ("02".equals(pickType)){//委托他人
......
...@@ -64,6 +64,10 @@ public class PickPayBiz { ...@@ -64,6 +64,10 @@ public class PickPayBiz {
64 BigDecimal totalAmount = new BigDecimal("0.01").multiply(new BigDecimal(trustCycle)). 64 BigDecimal totalAmount = new BigDecimal("0.01").multiply(new BigDecimal(trustCycle)).
65 multiply(new BigDecimal(pickTotal)).add(new BigDecimal("6")); 65 multiply(new BigDecimal(pickTotal)).add(new BigDecimal("6"));
66 // BigDecimal totalAmount = new BigDecimal("0.01");//调试接口代码写死 66 // BigDecimal totalAmount = new BigDecimal("0.01");//调试接口代码写死
67 + //80022109 钱勋 申请提货，经公司研究决定，给予该客户免除仓费的优惠，包装费正常收取，请技术协助处理一下，谢谢，以便客户尽快能完成提货相关手续。
68 + if("80022109".equals(ActionUtil.getUser().getUserId())){
69 + totalAmount= new BigDecimal("6");
70 + }
67 result.put("totalAmount", totalAmount); 71 result.put("totalAmount", totalAmount);
68 try { 72 try {
69 CreateQrCode createQrCode = new CreateQrCode(); 73 CreateQrCode createQrCode = new CreateQrCode();
......
...@@ -24,7 +24,7 @@ $(function() { ...@@ -24,7 +24,7 @@ $(function() {
24 $("#pickDate").datepicker({ 24 $("#pickDate").datepicker({
25 showOtherMonths : true, 25 showOtherMonths : true,
26 dateFormat : "yy-mm-dd", 26 dateFormat : "yy-mm-dd",
27 - minDate : minDate, 27 + minDate : 2,
28 defaultDate : 0, 28 defaultDate : 0,
29 beforeShowDay: $.datepicker.noWeekends, 29 beforeShowDay: $.datepicker.noWeekends,
30 onSelect: function(dateText, inst) { 30 onSelect: function(dateText, inst) {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <script type="text/javascript" src="${ctx }/resource/js/utils/jquery/jquery-ui-1.10.1.min.js"></script> 16 <script type="text/javascript" src="${ctx }/resource/js/utils/jquery/jquery-ui-1.10.1.min.js"></script>
17 <script type="text/javascript" src="${ctx }/resource/js/utils/jquery/jquery.ui.datepicker-zh-cn.js"></script> 17 <script type="text/javascript" src="${ctx }/resource/js/utils/jquery/jquery.ui.datepicker-zh-cn.js"></script>
18 <script type="text/javascript" src="${ctx }/resource/js/user/pick/pick.js"></script> 18 <script type="text/javascript" src="${ctx }/resource/js/user/pick/pick.js"></script>
19 - <script type="text/javascript" src="${ctx }/resource/js/user/pick/self.js"></script> 19 + <script type="text/javascript" src="${ctx }/resource/js/user/pick/self.js?v=347672232"></script>
20 <script type="text/javascript"> 20 <script type="text/javascript">
21 var errorMessage = '${ resultInfo.message }'; 21 var errorMessage = '${ resultInfo.message }';
22 //最小提货日期(0：普通自提；1：封装自提) 22 //最小提货日期(0：普通自提；1：封装自提)
...@@ -71,8 +71,7 @@ ...@@ -71,8 +71,7 @@
71 </form> 71 </form>
72 </div> 72 </div>
73 <div class="tip"> 73 <div class="tip">
74 - <p>• 自提时间：周一到周五（节假日除外） 9:00-16:00</p> 74 + <p>• 为了减少您提货时的等待时间，请在您选择的日期当天前来提货,时间为：9:00-16:00</p>
75 - <p>• 为了减少您提货时的等待时间，请在您选择的日期当天前来提货</p>
76 <c:if test="${pack == '1'}"> 75 <c:if test="${pack == '1'}">
77 <p>• 若果您提货数量大于1000枚，请设置较长的提货时间，给您来带的不便，敬请谅解！</p> 76 <p>• 若果您提货数量大于1000枚，请设置较长的提货时间，给您来带的不便，敬请谅解！</p>
78 </c:if> 77 </c:if>
......