Forráskód Böngészése

mj镜像返回镜像字段

zoujiajian 2 éve
szülő
commit
c5c881528b

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

@@ -290,6 +290,10 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private String phone;
 
+    @DbIgnore
+    @TableField(exist = false)
+    private Boolean isMirror;
+
     public enum Status {
         /**
          * 订单状态

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonSearchView.java

@@ -161,4 +161,7 @@ public class OrderDonSearchView {
 	 */
 	@DbField("o.ex_code")
 	private String exCode;
+
+	@DbField("sku.is_mirror")
+	private Boolean isMirror;
 }

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonView.java

@@ -95,6 +95,9 @@ public class OrderDonView {
     @DbField("o.status")
     private OrderDon.Status status;
 
+    @DbField("sku.is_mirror")
+    private Boolean isMirror;
+
     @DbField("o.type")
     private OrderDon.Type type;
 

+ 12 - 0
netflix-dao/src/main/java/com/cyksj/model/views/RenewalView.java

@@ -204,4 +204,16 @@ public class RenewalView {
      */
     @DbIgnore
     private BigDecimal mjPackagePrice;
+
+    /**
+     * 用户 mj fast次数
+     */
+    @DbIgnore
+    private Integer mjUserFastNum;
+
+    /**
+     * 用户 mj relax次数
+     */
+    @DbIgnore
+    private Integer mjUserRelaxNum;
 }

+ 18 - 0
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -31,6 +31,7 @@ import com.cyksj.service.groups.GroupsFuncService;
 import com.cyksj.service.mail.CuiQiuMailService;
 import com.cyksj.service.mail.MailService;
 import com.cyksj.service.mange.coupon.CouponCommonService;
+import com.cyksj.service.midjourney.MidjourneyAccountService;
 import com.cyksj.service.relation.GroupRelationFrontService;
 import com.cyksj.service.user.UserBindRelationService;
 import com.cyksj.service.user.UserLoginRecordService;
@@ -108,6 +109,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	private final UserCertRecordMapper userCertRecordMapper;
 
+	private final MidjourneyAccountService midjourneyAccountService;
+
 	//脆球邮箱后缀
 	private final static String CUI_QIU_EMAIL_SUFFIX = "@kindvd.com";
 	private final UpgradePackageMapper upgradePackageMapper;
@@ -236,6 +239,21 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				if (CollectionUtil.isNotEmpty(upgradePackages)){
 					upgradePackages.stream().map(e -> e.getPrice().divide(BigDecimal.valueOf(e.getNum()), 2, RoundingMode.HALF_UP)).min(BigDecimal::compareTo).ifPresent(ticket::setMjPackagePrice);
 				}
+				try {
+					MidjourneyUserView search = beanSearcher.searchFirst(MidjourneyUserView.class, MapUtils.flatBuilder(request.getParameterMap())
+							.field(MidjourneyUserView::getUserId, ticket.getUserId()).field(MidjourneyUserView::getRelationId, ticket.getRelationId())
+							.onlySelect(MidjourneyUserView::getMjFastNum, MidjourneyUserView::getMjRelaxNum)
+							.build());
+					if (search == null) {
+						MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(ticket.getUserId(), ticket.getRelationId());
+						ticket.setMjUserFastNum(midjourneyUser.getMjFastNum());
+						ticket.setMjUserRelaxNum(midjourneyUser.getMjRelaxNum());
+					} else {
+						ticket.setMjUserFastNum(search.getMjFastNum());
+						ticket.setMjUserRelaxNum(search.getMjRelaxNum());
+					}
+				} catch (Exception e) {
+				}
 			}
 			List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
 			ticket.setRelationViews(relationUserViews);

+ 8 - 0
netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -19,6 +19,7 @@ import com.cyksj.config.zfb.ZfbProductCode;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayApiCode;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.GoodsDonSkuMapper;
 import com.cyksj.mapper.OrderDonWaybillMapper;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.channel.UserPayEquipmentAvailableBenefitsMapper;
@@ -124,6 +125,9 @@ public class OrderController {
     @Autowired
     private MidjourneyAccountService midjourneyAccountService;
 
+    @Autowired
+    private GoodsDonSkuMapper skuMapper;
+
     /**
      * 支付
      * @author chan
@@ -165,6 +169,10 @@ public class OrderController {
             cookie.setPath("/");
             response.addCookie(userInfo);
         }
+        if (orderDon.getGoodsId() != null && orderDon.getGoodsId() == 26l) {
+            GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+            orderDon.setIsMirror(sku.getIsMirror());
+        }
 
         return GatewayResponse.SUCCESS.newBuilder().toResult(orderDon);
     }