|
|
@@ -27,6 +27,7 @@ import com.cyksj.mapper.channel.ChannelPopularizeMapper;
|
|
|
import com.cyksj.mapper.channel.UserPayEquipmentAvailableBenefitsMapper;
|
|
|
import com.cyksj.mapper.channel.UserPayEquipmentReceiveBenefitsRecordMapper;
|
|
|
import com.cyksj.mapper.claudecode.ClaudeCodeDeductOrderRelateMapper;
|
|
|
+import com.cyksj.mapper.codex.CodexDeductRecordMapper;
|
|
|
import com.cyksj.mapper.manage.RealGoodsOrderHandleMapper;
|
|
|
import com.cyksj.mapper.manage.cms.CmsUserMapper;
|
|
|
import com.cyksj.mapper.manage.coupon.CouponMapper;
|
|
|
@@ -147,6 +148,8 @@ public class CmsOrderController {
|
|
|
|
|
|
private final GoodsClickUserOrderRecordMapper goodsClickUserOrderRecordMapper;
|
|
|
|
|
|
+ private final CodexDeductRecordMapper codexDeductRecordMapper;
|
|
|
+
|
|
|
private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
|
|
|
|
|
|
@GetMapping("/get")
|
|
|
@@ -360,6 +363,12 @@ public class CmsOrderController {
|
|
|
data.setDeductMoney(claudeCodeDeductOrderRelate.getDeductMoney());
|
|
|
}
|
|
|
}
|
|
|
+ if (data.getGoodsId() == Constant.CODEX_GOODS_ID) {
|
|
|
+ CodexDeductRecord codexDeductRecord = codexDeductRecordMapper.selectOne(Wrappers.lambdaQuery(CodexDeductRecord.class).eq(CodexDeductRecord::getOrderId, data.getId()).last("limit 1"));
|
|
|
+ if (codexDeductRecord != null) {
|
|
|
+ data.setDeductMoney(codexDeductRecord.getDeductMoney());
|
|
|
+ }
|
|
|
+ }
|
|
|
//购买须知
|
|
|
Optional.ofNullable(goodsClickUserOrderRecordMapper.selectOne(Wrappers.lambdaQuery(GoodsClickUserOrderRecord.class).eq(GoodsClickUserOrderRecord::getOrderId, data.getId()).last("limit 1"))).ifPresent(c -> {
|
|
|
data.setPurchaseNotify(c.getPurchaseNotify());
|