zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20231122.9.06

Browse Source
This commit is contained in:
wangjinlei
2023-11-22 09:06:45 +08:00
parent 07f063ecaf
commit 01e3f19f82
12 changed files with 62 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/book/controller/BookController.java
View File

@@ -12,6 +12,7 @@ import com.peanut.modules.book.dao.BookDao;
import com.peanut.modules.book.entity.*;
import com.peanut.modules.book.service.*;
import com.peanut.modules.book.vo.BookIndexVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +25,7 @@ import com.peanut.common.utils.R;
* @email yl328572838@163.com
* @date 2022-08-04 15:36:59
*/
@Slf4j
@RestController
@RequestMapping("book/book")
public class BookController {

2
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -310,7 +310,7 @@ public class BuyOrderController {
return R.error(500, "花生币余额不足！");
}
}
// 2. 微信支付
// 2. 微信支付，需要预支付
if (Constants.PAYMENT_METHOD_WECHAT_PAY.equals(buyOrder.getPaymentMethod())) {
rabbitTemplate.convertAndSend(
DelayQueueConfig.ORDER_TO_BE_PAY_EXCHANGE,

3
src/main/java/com/peanut/modules/book/controller/UserAddressController.java
View File

@@ -46,6 +46,9 @@ public class UserAddressController {
if ((userAddressService.getUserDefaultAddressCount(userAddress.getUserId()) >= 1) && userAddress.getIsDefault() == 1) {
return R.error("已经存在默认地址");
}
if(userAddress.getRegionCode()==null||userAddress.getRegionCode().equals("")){
return R.error("地址异常添加失败！");
}
userAddressService.save(userAddress);
return R.ok();
}

9
src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
View File

@@ -122,7 +122,7 @@ public class AliPayServiceImpl implements AliPayService {
return "success";
}
PayZfbOrderEntity oldPayZfbOrderEntity = payZfbOrderService.getOne(new QueryWrapper<PayZfbOrderEntity>().eq("out_trade_no", aliNotifyDto.getOutTradeNo()));
CopyUtils.copyProperties(aliNotifyDto,oldPayZfbOrderEntity);
CopyUtils.copyProperties(aliNotifyDto,oldPayZfbOrderEntity);
payZfbOrderService.updateById(oldPayZfbOrderEntity);
@@ -181,13 +181,9 @@ public class AliPayServiceImpl implements AliPayService {
}
if ("order".equals(subject)) {
System.out.println("=====到order更新字段==================================================================================================================");
BuyOrder orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrder>().eq("order_sn", oldPayZfbOrderEntity.getRelevanceoid()));
System.out.println("======orderEntity=========="+orderEntity);
BigDecimal realMoney = orderEntity.getRealMoney();
System.out.println("======realMoney=========="+realMoney);
BigDecimal bigDecimal = new BigDecimal(oldPayZfbOrderEntity.getBuyerPayAmount());
System.out.println("======bigDecimal=========="+bigDecimal);
//更新 订单 记录
if (bigDecimal.compareTo(realMoney) == 0) {
buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"0");
@@ -216,8 +212,7 @@ public class AliPayServiceImpl implements AliPayService {
//TODO 更新用户优惠券状态
//TODO 推送一路健康优惠券