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

修复bug

This commit is contained in:
kuang.yife 2023-03-25 20:51:44 +08:00
parent 73abda24b7
commit ff4e772e09
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java
View File

@ -8,6 +8,7 @@ import com.ghy.common.adapay.model.Merchant;
import com.ghy.common.core.domain.AjaxResult; import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.utils.AdapayUtils; import com.ghy.common.utils.AdapayUtils;
import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.ExceptionUtil;
import com.ghy.common.utils.spring.SpringUtils;
import com.ghy.customer.domain.CustomerBank; import com.ghy.customer.domain.CustomerBank;
import com.ghy.customer.request.BindBankCardRequest; import com.ghy.customer.request.BindBankCardRequest;
import com.ghy.customer.service.CustomerBankService; import com.ghy.customer.service.CustomerBankService;
@ -28,7 +29,7 @@ import java.util.Set;
* @author HH 2022/5/20 * @author HH 2022/5/20
*/ */
@Slf4j @Slf4j
@Controller @RestController
@RequestMapping("/customer/bankcard") @RequestMapping("/customer/bankcard")
public class CustomerBankController { public class CustomerBankController {
@ -47,6 +48,9 @@ public class CustomerBankController {
for (Merchant merchant : merchants) { for (Merchant merchant : merchants) {
String memberId = AdapayUtils.getCustomerMemberId(request.getCustomerId(), merchant.getDeptId()); String memberId = AdapayUtils.getCustomerMemberId(request.getCustomerId(), merchant.getDeptId());
if(adapayService == null){
adapayService = SpringUtils.getBean(AdapayService.class);
}
// 需要先检查一次memberId是否已存在，如果已存在则只需要绑卡即可 // 需要先检查一次memberId是否已存在，如果已存在则只需要绑卡即可
Map<String, Object> member = adapayService.queryMember(merchant.getDeptId(), memberId); Map<String, Object> member = adapayService.queryMember(merchant.getDeptId(), memberId);
if (AdapayStatusEnum.succeeded.code.equals(member.get("status")) && memberId.equals(member.get("member_id"))) { if (AdapayStatusEnum.succeeded.code.equals(member.get("status")) && memberId.equals(member.get("member_id"))) {

4
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -139,8 +139,8 @@ public class OrderServiceImpl implements OrderService {
// 查询出"待确认"状态的子订单 // 查询出"待确认"状态的子订单
List<OrderDetail> orderDetails = orderDetailService.selectByStatus(Collections.singletonList(OrderStatus.FINISH_CHECK.code())); List<OrderDetail> orderDetails = orderDetailService.selectByStatus(Collections.singletonList(OrderStatus.FINISH_CHECK.code()));
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
// long day14ago = now - (60 * 60 * 1000L); long day14ago = now - (60 * 60 * 1000L);
long day14ago = now - 10000L; // long day14ago = now - 10000L;
for (OrderDetail orderDetail : orderDetails) { for (OrderDetail orderDetail : orderDetails) {
// 筛选符合自动确认的订单 // 筛选符合自动确认的订单
if (day14ago > orderDetail.getUpdateTime().getTime()) { if (day14ago > orderDetail.getUpdateTime().getTime()) {