commit

src/main/java/com/example/afrishop_v3/controllers/AuthController.java

@@ -6,11 +6,13 @@ import com.example.afrishop_v3.config.DomainProperties;
 import com.example.afrishop_v3.enums.ResultCodeEnum;
 import com.example.afrishop_v3.enums.SexEnum;
 import com.example.afrishop_v3.enums.UserTypeEnum;
+import com.example.afrishop_v3.models.Network;
 import com.example.afrishop_v3.models.TbCfCoupon;
 import com.example.afrishop_v3.models.TbCfToicoupon;
 import com.example.afrishop_v3.models.TbCfUserInfo;
 import com.example.afrishop_v3.payload.request.LoginRequest;
 import com.example.afrishop_v3.payload.response.MessageResponse;
+import com.example.afrishop_v3.repository.NetworkRepository;
 import com.example.afrishop_v3.repository.TbCfCouponRepository;
 import com.example.afrishop_v3.repository.TbCfToicouponRepository;
 import com.example.afrishop_v3.repository.UserRepository;
@@ -50,6 +52,7 @@ public class AuthController {
 	private final UserRepository userRepository;
 	private final TbCfCouponRepository couponRepository;
 	private final TbCfToicouponRepository toicouponRepository;
+	private final NetworkRepository networkRepository;
 
 
 	private final PasswordEncoder encoder;
@@ -57,11 +60,12 @@ public class AuthController {
 
 	private final JwtUtils jwtUtils;
 
-	public AuthController(AuthenticationManager authenticationManager, UserRepository userRepository, TbCfCouponRepository couponRepository, TbCfToicouponRepository toicouponRepository, PasswordEncoder encoder, DomainProperties domainProperties, JwtUtils jwtUtils) {
+	public AuthController(AuthenticationManager authenticationManager, UserRepository userRepository, TbCfCouponRepository couponRepository, TbCfToicouponRepository toicouponRepository, NetworkRepository networkRepository, PasswordEncoder encoder, DomainProperties domainProperties, JwtUtils jwtUtils) {
 		this.authenticationManager = authenticationManager;
 		this.userRepository = userRepository;
 		this.couponRepository = couponRepository;
 		this.toicouponRepository = toicouponRepository;
+		this.networkRepository = networkRepository;
 		this.encoder = encoder;
 		this.domainProperties = domainProperties;
 		this.jwtUtils = jwtUtils;
@@ -238,6 +242,18 @@ public class AuthController {
 				user.setCode(hashids.encode(codeCount));
 			}
 
+			Network top = networkRepository.findTopByOrderByIdDesc();
+
+			if( top != null ) {
+				if (!networkRepository.existsByUserInfo_CodeAndNetworkInfo_UserId(top.getNetworkId(), user.getUserId())){
+					Network network = new Network();
+					network.setUserInfo(top.getNetworkInfo());
+					network.setNetworkInfo(user);
+					networkRepository.save(network);
+					user.setInvitation(1);
+				}
+			}
+
 			user.setLastLoginTime(new Date());
 			userRepository.save(user);
 			//注册成功 创建token

src/main/java/com/example/afrishop_v3/controllers/CartController.java

@@ -153,7 +153,7 @@ public class CartController extends Controller {
                 TbCfExpressTemplate expressTemplate = null;
                 try {
                     expressTemplate = recognizeItemCategory(tbCfItemDetail.getItemTitle());
-                } catch (ExecutionException | InterruptedException | TimeoutException e) {
+                } catch (Exception e) {
                     System.out.println(e.getMessage());
                 }
                 if (expressTemplate != null) {

src/main/java/com/example/afrishop_v3/controllers/CouponController.java

 package com.example.afrishop_v3.controllers;
 
 import com.example.afrishop_v3.base.Result;
+import com.example.afrishop_v3.enums.ResultCodeEnum;
 import com.example.afrishop_v3.models.TbCfToicoupon;
 import com.example.afrishop_v3.repository.TbCfCouponRepository;
 import com.example.afrishop_v3.repository.TbCfToicouponRepository;
@@ -26,17 +27,23 @@ public class CouponController {
 
     @GetMapping
     public Result getUserCoupons(){
-        String userId = user.userId();
-        List<TbCfToicoupon> availableCoupons = repository.queryUserAvailableCoupon(userId);
-        List<TbCfToicoupon> expiredCoupons = repository.queryUserExpiredCoupon(userId);
-        List<TbCfToicoupon> usedCoupons = repository.queryUserUsedCoupon(userId);
+        try {
 
-        LinkedHashMap<String, Object> hashMap = new LinkedHashMap<>();
+            String userId = user.userId();
+            List<TbCfToicoupon> availableCoupons = repository.queryUserAvailableCoupon(userId);
+            List<TbCfToicoupon> expiredCoupons = repository.queryUserExpiredCoupon(userId);
+            List<TbCfToicoupon> usedCoupons = repository.queryUserUsedCoupon(userId);
 
-        hashMap.put("validCouponList",availableCoupons);
-        hashMap.put("usedCouponList",usedCoupons);
-        hashMap.put("expiredCouponList",expiredCoupons);
+            LinkedHashMap<String, Object> hashMap = new LinkedHashMap<>();
 
-        return new Result<>(hashMap);
+            hashMap.put("validCouponList",availableCoupons);
+            hashMap.put("usedCouponList",usedCoupons);
+            hashMap.put("expiredCouponList",expiredCoupons);
+
+            return new Result<>(hashMap);
+        }catch (Exception e){
+            System.out.println(e.getMessage());
+            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),e.getMessage());
+        }
     }
 }

src/main/java/com/example/afrishop_v3/controllers/OrderController.java

@@ -64,7 +64,7 @@ public class OrderController {
 
 
     @GetMapping("/payNow")
-    public Result<TbCfOrder> payNow(@RequestParam("itemId") String itemId, @RequestParam("itemNum") Integer itemNum, @RequestParam("itemSku") String itemSku, @RequestParam(value = "toitableId", required = false) String toitableId) {
+    public Result<TbCfOrder> payNow(@RequestParam("itemId") String itemId, @RequestParam("itemNum") Integer itemNum, @RequestParam(value = "itemSku",defaultValue = "") String itemSku, @RequestParam(value = "toitableId", required = false) String toitableId) {
         TbCfOrder order = new TbCfOrder();
 
         if (StringUtils.isBlank(itemId) || itemNum == null || itemNum <= 0)

src/main/java/com/example/afrishop_v3/models/Network.java

@@ -27,6 +27,10 @@ public class Network extends Model {
         this.userInfo = userInfo;
     }
 
+    public void setNetworkInfo(TbCfUserInfo networkInfo) {
+        this.networkInfo = networkInfo;
+    }
+
     public String getCode() {
         return code;
     }

src/main/java/com/example/afrishop_v3/models/TbCfUserInfo.java

@@ -256,6 +256,10 @@ public class TbCfUserInfo {
         return userId;
     }
 
+    public void setInvitation(int inv){
+        this.invitation = inv;
+    }
+
 
     @JsonProperty
     public double getWallet() {

src/main/java/com/example/afrishop_v3/repository/NetworkRepository.java

@@ -14,5 +14,7 @@ public interface NetworkRepository extends PagingAndSortingRepository<Network,Lo
     Network findByUserInfo_CodeAndNetworkInfo_UserId(String userInfo_code, String networkInfo_userId);
     Optional<Network> findByNetworkInfoCode(String user_code);
 
+    Network findTopByOrderByIdDesc();
+
     Page<Network> findAllByUserInfo_UserIdOrderByIdDesc(String userInfo_userId, Pageable pageable);
 }