...
|
...
|
@@ -22,6 +22,7 @@ import com.yohoufo.order.model.response.PrepayResponse; |
|
|
import com.yohoufo.order.service.impl.PaymentServiceImpl;
|
|
|
import com.yohoufo.order.service.impl.SellerService;
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
...
|
...
|
@@ -81,6 +82,9 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService { |
|
|
//@Value("${order.seller.tip.recoverTip:充值 ¥{} 恢复超级商家权限}")
|
|
|
private String recoverTip = "充值 ¥{} 恢复超级商家权限";
|
|
|
|
|
|
private String saleListLowMoneyTip = "您的保证金余额不足,出售中商品将会被强制隐藏,不会给用户展示";
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 更新订单状态
|
...
|
...
|
@@ -403,7 +407,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService { |
|
|
result.put("entryTime", (storedSeller == null || storedSeller.getEnterTime() < 1) ? ""
|
|
|
: sdf.format(1000L * storedSeller.getEnterTime()));
|
|
|
result.put("publishMoneyTip", publishMoneyTip + publishMinMoney.toString());
|
|
|
// TODO 查询用户权限状态
|
|
|
// 查询用户权限状态
|
|
|
boolean logoGray = allMoney.compareTo(publishMinMoney) < 0;
|
|
|
result.put("logoGray", logoGray);
|
|
|
result.put("publishFunctionTip", publishFunctionTip);
|
...
|
...
|
@@ -412,6 +416,11 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService { |
|
|
result.put("canSaleMoneyTip", canSaleMoneyTip + canSaleMoney.toString());
|
|
|
result.put("canSaleFunctionTip", canSaleFunctionTip);
|
|
|
result.put("recoverTip", recoverTip.replace("{}", lackOfMoneyAsSuper.toString()));
|
|
|
if (allMoney.compareTo(canSaleMoney) < 0) {
|
|
|
result.put("saleListLowMoneyTip", saleListLowMoneyTip);
|
|
|
} else {
|
|
|
result.put("saleListLowMoneyTip", StringUtils.EMPTY);
|
|
|
}
|
|
|
return new com.yohoufo.common.ApiResponse(200, "查询成功", result);
|
|
|
}
|
|
|
|
...
|
...
|
|