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

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/WorkerWarrantyVO.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @ApiModel
 @ZfireField(tbName = "a")
-public class WorkerWarrantyVO   {
+public class WorkerWarrantyVO    {
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "质保id")
@@ -27,6 +27,9 @@ public class WorkerWarrantyVO   {
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
     @ApiModelProperty(value = "师傅编号")
     private String workerNumber;
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerWarrantyLogic.java

@@ -239,6 +239,7 @@ public class WorkerWarrantyLogic {
             if (CollectionUtils.isNotEmpty(workerWarrantyListUp) && workerWarranty.getRefundAmount() != null)
                 workerWarranty.setRefundAmount(workerWarrantyListUp.get(0).getRefundAmount().add(workerWarranty.getRefundAmount()));
 
+            workerWarranty.setWaitAmount(workerWarranty.getShouldAmount().subtract(workerWarranty.getPayableAmount() == null?BigDecimal.ZERO:workerWarranty.getPayableAmount()));
             workerWarranties.add(workerWarranty);
 
         }