fix 代码冲突

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

@@ -130,10 +130,9 @@ public class GoodsDonViews {
     @DbIgnore
     private GoodsDonSpecFrontView specs;
 
+    @DbIgnore
     private String giftCards;
 
     @DbIgnore
     private List<GoodsSkuGiftCardView> giftCardsView;
-
-    private BigDecimal giftCardCash;
 }

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

@@ -57,10 +57,7 @@ import com.cyksj.model.entity.*;
 import com.cyksj.model.manage.dto.GiftCardDto;
 import com.cyksj.model.manage.views.GroupsRelationView;
 import com.cyksj.model.manage.views.OrderDonView;
-import com.cyksj.model.request.OrderAttach;
-import com.cyksj.model.request.OrderPayRequest;
-import com.cyksj.model.request.TelegramBotMsgReq;
-import com.cyksj.model.request.TransferAccountsReq;
+import com.cyksj.model.request.*;
 import com.cyksj.model.views.CouponNewUserView;
 import com.cyksj.model.views.CouponUserView;
 import com.cyksj.model.views.GiftCardGoodsSkuFrontView;
@@ -277,7 +274,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		User user;
 		String payOpenId = null;
 		Long relationId = 0L;
-		GroupsRelation relation = null;
 		Boolean isNeedTicket = checkIsNeedGroupsRelation(goodsDon);
 		Long userId = payRequest.getUserId();
 		if (userId != null) {
@@ -286,6 +282,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				throw new BusinessRuntimeException("您有未支付订单.");
 			}
 		}
+		GroupsRelation relation = null;
 		if (userId == null) {
 			user = new User();
 			user.setId(0l);
@@ -2133,6 +2130,40 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		});
 	}
 
+	private void sendOrderPhoneMsg(Long userId) {
+		User user = userMapper.selectById(userId);
+		String phone = null;
+		if (StrUtil.isNotBlank(user.getLoginPhone())) {
+			phone = user.getLoginPhone();
+		} else {
+			//获取对应手机号
+			UserBindDetail userBindDetail = userBindDetailMapper.selectOne(Wrappers.lambdaQuery(UserBindDetail.class)
+					.eq(StrUtil.isNotBlank(user.getOpenId()), UserBindDetail::getUserId, user.getId())
+					.eq(StrUtil.isNotBlank(user.getEmail()), UserBindDetail::getEmailUserId, user.getId()));
+			if (userBindDetail != null && StrUtil.isNotBlank(userBindDetail.getPhone())) {
+				phone = userBindDetail.getPhone();
+			}
+		}
+		if (StrUtil.isNotBlank(phone)) {
+			//是否发送过手机短信
+			UserPhoneSendRecord userPhoneSendRecord = userPhoneSendRecordMapper.selectOne(Wrappers.lambdaQuery(UserPhoneSendRecord.class)
+					.eq(UserPhoneSendRecord::getPhone, phone).last("limit 1"));
+			if (userPhoneSendRecord == null) {
+				try {
+					Boolean is_success = SmsUtil.sendLuoKey2Msg(phone, String.format(Constant.ORDER_MSG_FIRST_NOTIFY, user.getNickname()));
+					if (is_success) {
+						log.info("用户userId:{},购买成功,发送第一次手机号:{}短信官网信息通知", userId, phone);
+						userPhoneSendRecord = new UserPhoneSendRecord();
+						userPhoneSendRecord.setOrderUserId(userId);
+						userPhoneSendRecord.setPhone(phone);
+						userPhoneSendRecordMapper.insert(userPhoneSendRecord);
+					}
+				} catch (Exception e) {
+				}
+			}
+		}
+	}
+
 
 	@Override
 	public void orderNotify(OrderDon orderDon) {

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -31,10 +31,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**