fix 订单优惠券信息

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDon.java

@@ -124,6 +124,11 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private Long couponUserId;
 
+    /**
+     * 优惠券id
+     */
+    private Long couponId;
+
     /**
      * 购买数量
      */

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonBackView.java

@@ -168,6 +168,9 @@ public class OrderDonBackView {
 	@DbField("o.coupon_money")
 	private BigDecimal couponMoney;
 
+	@DbField("o.coupon_id")
+	private Long couponId;
+
 	@DbField("o.popularize_id")
 	private Long popularizeId;
 

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

@@ -1377,6 +1377,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 			orderDon.setCouponMoney(couponMoney);
 			orderDon.setCouponUserId(couponUser.getId());
+			orderDon.setCouponId(couponUser.getCouponId());
 		}
 
 		//存在余额

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -93,7 +93,7 @@ public class CmsOrderController {
 
 
 	@GetMapping("/get")
-	public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId, Long acId, String nickname, String register, Boolean isGoogle, Boolean isSubsidy) {
+	public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId, Long acId, String nickname, String register, Boolean isGoogle, Boolean isSubsidy, Boolean isRenewPackage) {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (channelId != null) {
 			List<Long> popularizeIds = channelPopularizeMapper.getPopularizeIdByChannelId(channelId);
@@ -143,6 +143,12 @@ public class CmsOrderController {
 			}
 			conditionSql += " exists (select 1 from order_don_subsidy_relate ocr where ocr.order_id = o.id limit 1)";
 		}
+		if (isRenewPackage != null) {
+			if (StrUtil.isNotEmpty(conditionSql)) {
+				conditionSql += " and ";
+			}
+			conditionSql += " exists (select 1 from order_don_renew_record odrr1 where odrr1.order_id = o.id limit 1)";
+		}
 		if (StrUtil.isNotBlank(conditionSql)) {
 			builder.put("condition", conditionSql);
 		}
@@ -152,6 +158,12 @@ public class CmsOrderController {
 				Optional.ofNullable(channelPopularizeMapper.selectChannelByPid(data.getPopularizeId()))
 						.ifPresent(channelName -> data.setChannel(channelName));
 			}
+			if (data.getCouponId() != null) {
+				Optional.ofNullable(couponMapper.selectById(data.getCouponId()))
+						.ifPresent(coupon -> data.setCouponName(coupon.getName()));
+				data.setCouponMoney(data.getCouponMoney() == null ? BigDecimal.ZERO : data.getCouponMoney());
+			}
+
 			if (data.getCouponUserId() != 0) {
 				data.setCouponName(couponMapper.getCouponNameByCouponUserId(data.getCouponUserId()));
 				data.setCouponMoney(data.getCouponMoney() == null ? BigDecimal.ZERO : data.getCouponMoney());