Skip to content

Z
zsh
Commit 3900bf6a authored by wuwz's avatar wuwz
Browse files
Options

装修订单bug

parent 76b4a9da
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 21 deletions
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/account_nav.html
View file @ 3900bf6a
...@@ -50,7 +50,7 @@ jQuery(document).ready(function(){ ...@@ -50,7 +50,7 @@ jQuery(document).ready(function(){
<li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li> <li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li>
#end #end
<!-- <li op="zsh_buyer_cash"><a href="$!webPath/buyer/contract_list.htm">装修订单</a></li> --> <li op="zsh_buyer_cash"><a href="$!webPath/buyer/contract_list.htm">装修订单</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/contract_detailed.html
View file @ 3900bf6a
...@@ -193,17 +193,12 @@ $!httpInclude.include("/top.htm") ...@@ -193,17 +193,12 @@ $!httpInclude.include("/top.htm")
</span> </span>
</div> </div>
#end #end
</div>
</div>
<!--支付完成开始装修，有完成装修按钮 --> <!--支付完成开始装修，有完成装修按钮 -->
#if($!user.id == $!objs.decorate.user.id && $!objs.state == 4) #if($!user.id == $!objs.decorate.user.id && $!objs.state == 4)
<div> <div>
<span class="allmen size7"> <span class="allmen size7">
<a href="$!webPath/buyer/finish_trim.htm?id=$!objs.id&state=5" class="blue">装修完成</a> <a href="$!webPath/buyer/finish_trim.htm?id=$!objs.id&state=5" class="blue yes" style="border-radius:5px;padding：6px;">装修完成</a>
</span> </span>
</div> </div>
#end #end
...@@ -212,7 +207,7 @@ $!httpInclude.include("/top.htm") ...@@ -212,7 +207,7 @@ $!httpInclude.include("/top.htm")
#if($!user.id == $!objs.user.id && $!objs.state == 5) #if($!user.id == $!objs.user.id && $!objs.state == 5)
<div> <div>
<span class="allmen size7"> <span class="allmen size7">
<a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=1" class="blue">客户验收</a> <a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=1" class="blue yes" style="border-radius:5px;padding：6px;">客户验收</a>
</span> </span>
</div> </div>
#end #end
...@@ -221,7 +216,7 @@ $!httpInclude.include("/top.htm") ...@@ -221,7 +216,7 @@ $!httpInclude.include("/top.htm")
#if($!user.id == $!objs.user.id && $!objs.state == 6) #if($!user.id == $!objs.user.id && $!objs.state == 6)
<div> <div>
<span class="allmen size7"> <span class="allmen size7">
<a id="menberService" onclick="showPay($!objs.id)" class="blue">支付</a> <a id="menberService" onclick="showPay($!objs.id)" class="blue yes" style="border-radius:5px;padding：6px;">支付</a>
</span> </span>
</div> </div>
#end #end
...@@ -230,7 +225,7 @@ $!httpInclude.include("/top.htm") ...@@ -230,7 +225,7 @@ $!httpInclude.include("/top.htm")
#if($!user.id == $!objs.decorate.user.id && $!objs.state == 7) #if($!user.id == $!objs.decorate.user.id && $!objs.state == 7)
<div> <div>
<span class="allmen size7"> <span class="allmen size7">
<a href="$!webPath/buyer/finish_trim.htm?id=$!objs.id&state=8" class="blue">装修完成</a> <a href="$!webPath/buyer/finish_trim.htm?id=$!objs.id&state=8" class="blue yes" style="border-radius:5px;padding：6px;">装修完成</a>
</span> </span>
</div> </div>
#end #end
...@@ -239,7 +234,7 @@ $!httpInclude.include("/top.htm") ...@@ -239,7 +234,7 @@ $!httpInclude.include("/top.htm")
#if($!user.id == $!objs.user.id && $!objs.state == 8) #if($!user.id == $!objs.user.id && $!objs.state == 8)
<div> <div>
<span class="allmen size7"> <span class="allmen size7">
<a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=2" class="blue">客户验收</a> <a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=2" class="blue yes" style="border-radius:5px;padding：6px;">客户验收</a>
</span> </span>
</div> </div>
#end #end
...@@ -248,7 +243,7 @@ $!httpInclude.include("/top.htm") ...@@ -248,7 +243,7 @@ $!httpInclude.include("/top.htm")
#if($!user.id == $!objs.user.id && $!objs.state == 9) #if($!user.id == $!objs.user.id && $!objs.state == 9)
<div> <div>
<span class="allmen size7"> <span class="allmen size7">
<a id="menberService" onclick="showPay($!objs.id)" class="blue">支付</a> <a id="menberService" onclick="showPay($!objs.id)" class="blue yes" style="border-radius:5px;padding：6px;">支付</a>
</span> </span>
</div> </div>
#end #end
...@@ -257,7 +252,7 @@ $!httpInclude.include("/top.htm") ...@@ -257,7 +252,7 @@ $!httpInclude.include("/top.htm")
#if($!user.id == $!objs.decorate.user.id && $!objs.state == 10) #if($!user.id == $!objs.decorate.user.id && $!objs.state == 10)
<div> <div>
<span class="allmen size7"> <span class="allmen size7">
<a href="$!webPath/buyer/finish_trim.htm?id=$!objs.id&state=11" class="blue">装修完成</a> <a href="$!webPath/buyer/finish_trim.htm?id=$!objs.id&state=11" class="blue yes" style="border-radius:5px;padding：6px;">装修完成</a>
</span> </span>
</div> </div>
#end #end
...@@ -266,7 +261,7 @@ $!httpInclude.include("/top.htm") ...@@ -266,7 +261,7 @@ $!httpInclude.include("/top.htm")
#if($!user.id == $!objs.user.id && $!objs.state == 11) #if($!user.id == $!objs.user.id && $!objs.state == 11)
<div> <div>
<span class="allmen size7"> <span class="allmen size7">
<a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=3" class="blue">客户验收</a> <a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=3" class="blue yes" style="border-radius:5px;padding：6px;">客户验收</a>
</span> </span>
</div> </div>
#end #end
...@@ -274,13 +269,13 @@ $!httpInclude.include("/top.htm") ...@@ -274,13 +269,13 @@ $!httpInclude.include("/top.htm")
#if($!user.id == $!objs.user.id && $!objs.state == 12) #if($!user.id == $!objs.user.id && $!objs.state == 12)
<div> <div>
<span class="allmen size7"> <span class="allmen size7">
<a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=4" class="blue">竣工验收</a> <a href="$!webPath/buyer/confirm_trim.htm?id=$!objs.id&number=4" class="blue yes" style="border-radius:5px;padding：6px;">竣工验收</a>
</span> </span>
</div> </div>
#end #end
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
src/com/shopping/view/web/action/LoginViewAction.java
View file @ 3900bf6a
...@@ -1033,12 +1033,21 @@ public class LoginViewAction { ...@@ -1033,12 +1033,21 @@ public class LoginViewAction {
if("0".equals(contract.getPayState())) { if("0".equals(contract.getPayState())) {
//给装修公司打首款 //给装修公司打首款
User decorateUser = contract.getDecorate().getUser(); User decorateUser = contract.getDecorate().getUser();
Double pay = (contract.getContractAmount() - (contract.getContractAmount()*contract.getCommission()/100))*0.2;
decorateUser.setAvailableBalance(decorateUser.getAvailableBalance().add(new BigDecimal(pay.toString()))); //总金额
BigDecimal amount = new BigDecimal(contract.getContractAmount().toString());
//分佣比例
BigDecimal bl = new BigDecimal(contract.getCommission().toString()).divide(new BigDecimal("100"));
//分佣金额
BigDecimal fy = amount.multiply(bl);
//付给装修公司金额
BigDecimal pay = (amount.subtract(fy)).multiply(new BigDecimal("0.2"));
decorateUser.setAvailableBalance(decorateUser.getAvailableBalance().add(pay));
PredepositLog logPay = new PredepositLog(); PredepositLog logPay = new PredepositLog();
logPay.setAddTime(new Date()); logPay.setAddTime(new Date());
logPay.setPd_log_amount(zshOrder.getTotalPrice()); logPay.setPd_log_amount(pay);
logPay.setPd_log_info("装修公司首款"); logPay.setPd_log_info("装修公司首款");
logPay.setPd_log_user(decorateUser); logPay.setPd_log_user(decorateUser);
logPay.setPd_op_type("装修公司首款"); logPay.setPd_op_type("装修公司首款");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment