Merge branch 'refs/heads/bj_func' into pre

netflix-service/src/main/java/com/cyksj/service/codex/impl/CodexServiceImpl.java

@@ -846,6 +846,9 @@ public class CodexServiceImpl implements CodexService {
 				}
 				//当天购买的按规格原价抵扣
 				if (now.toDateStr().equals(DateUtil.format(relationStartTime, "yyyy-MM-dd")) && (DateUtil.betweenDay(thisOrderExpiryTime, relationExpiryTime, true) == 0)) {
+                    if (codexDeductRecord != null) {
+                        thisOrderMoney = thisOrderMoney.add(Optional.ofNullable(codexDeductRecord.getDeductMoney()).orElse(BigDecimal.ZERO));
+                    }
 					return thisOrderMoney;
 				}
 			}