clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

增加一些日志

This commit is contained in:
HH 2022-07-21 11:44:32 +08:00
parent a6f90fb51c
commit cfbc5aee58
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -36,7 +36,6 @@ import com.ghy.worker.domain.WorkerCertification;
import com.ghy.worker.service.IWorkerCertificationService; import com.ghy.worker.service.IWorkerCertificationService;
import com.ghy.worker.service.WorkerService; import com.ghy.worker.service.WorkerService;
import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.core.exception.BaseAdaPayException;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -55,7 +54,6 @@ import java.util.List;
*/ */
@Controller @Controller
@RequestMapping("/order/master") @RequestMapping("/order/master")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class OrderMasterController extends BaseController { public class OrderMasterController extends BaseController {
private final String prefix = "order/master"; private final String prefix = "order/master";

4
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -78,6 +78,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
@Override @Override
public int updateOrderMaster(OrderMaster orderMaster) throws BaseAdaPayException { public int updateOrderMaster(OrderMaster orderMaster) throws BaseAdaPayException {
if (orderMaster.getOrderStatus().equals(OrderStatus.FINISH.code())) { if (orderMaster.getOrderStatus().equals(OrderStatus.FINISH.code())) {
logger.info("订单[{}]完成，进入确认分账", orderMaster.getCode());
confirm(orderMaster.getId()); confirm(orderMaster.getId());
} }
return orderMasterMapper.updateOrderMaster(orderMaster); return orderMasterMapper.updateOrderMaster(orderMaster);
@ -137,6 +138,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
Assert.notNull(payment, "找不到支付记录"); Assert.notNull(payment, "找不到支付记录");
if (BigDecimal.ZERO.compareTo(financialMaster.getPayMoney()) < 0) { if (BigDecimal.ZERO.compareTo(financialMaster.getPayMoney()) < 0) {
logger.info("订单[{}]支付金额<=0，不需要分账", orderMaster.getCode());
// 支付金额<=0的话 不需要走下面的流程了 // 支付金额<=0的话 不需要走下面的流程了
return; return;
} }
@ -192,11 +194,13 @@ public class OrderMasterServiceImpl implements OrderMasterService {
JSONObject response = adapayService.paymentConfirm(orderMaster.getDeptId(), payment.getId(), payment.getOrderNo(), JSONObject response = adapayService.paymentConfirm(orderMaster.getDeptId(), payment.getId(), payment.getOrderNo(),
AdapayUtils.bigDecimalToString(confirmAmt), divMembers, null, null); AdapayUtils.bigDecimalToString(confirmAmt), divMembers, null, null);
logger.info("订单[{}]分账结果: {}", orderMaster.getCode(), response.toJSONString());
boolean status = AdapayStatusEnum.succeeded.code.equals(response.getString("status")); boolean status = AdapayStatusEnum.succeeded.code.equals(response.getString("status"));
// 如果确认支付失败 这里抛出异常 // 如果确认支付失败 这里抛出异常
Assert.isTrue(status, response.getString("error_msg")); Assert.isTrue(status, response.getString("error_msg"));
// 走到这里确认支付和分账都成功了 异步进入自动提现流程 // 走到这里确认支付和分账都成功了 异步进入自动提现流程
logger.info("订单[{}]开始自动提现", orderMaster.getCode());
autoDrawCashMembers.forEach(member -> executor.execute(() -> { autoDrawCashMembers.forEach(member -> executor.execute(() -> {
String memberId = member.getMemberId(); String memberId = member.getMemberId();
String amount = member.getAmount(); String amount = member.getAmount();