fix

netflix-dao/src/main/resources/mapper/CouponUserMapper.xml

@@ -61,8 +61,9 @@
         and cu.status = 'unused'
         and cu.channel != 'exCode'
         and cu.valid_start_time < now()
+        and cu.valid_end_time > now()
         <if test="isRenew != null and isRenew">
-            and cp.is_renew = #{isRenew}
+            and cp.is_renew = ${isRenew}
         </if>
     </select>
 

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -510,20 +510,20 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setStatus(OrderDon.Status.noPayment);
 		orderDon.setUserId(user.getId());
 		orderDon.setGoodsId(goodsDon.getId());
-		orderDon.setRealMoney(payRequest.getDonMoney());
+		orderDon.setRealMoney(orderDon.getMoney());
 		//存在优惠券
 		if (couponUser != null) {
 			Long couponId = couponUser.getCouponId();
 			Coupon coupon = couponMapper.getCouponById(couponId);
 			BigDecimal couponMoney = null;
 			if (coupon.getType() == Coupon.Type.discount) {
-				BigDecimal discountMoney = payRequest.getDonMoney().multiply(coupon.getDiscount());
+				BigDecimal discountMoney = orderDon.getMoney().multiply(coupon.getDiscount());
 				orderDon.setMoney(discountMoney);
-				couponMoney = payRequest.getDonMoney().subtract(discountMoney);
+				couponMoney = orderDon.getMoney().subtract(discountMoney);
 			} else if (coupon.getType() == Coupon.Type.reduce) {
-				BigDecimal subtractMoney = payRequest.getDonMoney().subtract(coupon.getReduceMoney());
+				BigDecimal subtractMoney = orderDon.getMoney().subtract(coupon.getReduceMoney());
 				orderDon.setMoney(subtractMoney);
-				couponMoney = payRequest.getDonMoney().subtract(subtractMoney);
+				couponMoney = orderDon.getMoney().subtract(subtractMoney);
 			}
 			orderDon.setCouponMoney(couponMoney);
 			orderDon.setCouponUserId(couponUser.getId());