Merge remote-tracking branch 'origin/test' into test

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppCombinationController.java

@@ -9,17 +9,13 @@ import com.txz.mall.business.OrderServiceBusiness;
 import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.core.ServiceException;
-import com.txz.mall.enums.SpuSortEnum;
 import com.txz.mall.model.StoreCombination;
-import com.txz.mall.model.StoreProduct;
 import com.txz.mall.service.StoreCombinationService;
 import com.txz.mall.service.StoreOrderService;
 import com.txz.mall.service.StoreProductService;
-import com.txz.mall.util.I18nUtil;
 import com.txz.mall.web.param.addparam.StoreCombinationAddParam;
 import com.txz.mall.web.param.result.StoreCombinationVO;
 import com.txz.mall.web.vo.SpuListRO;
-import dto.GoPinkDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -34,7 +30,6 @@ import vo.StoreCombinationRankVO;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -44,16 +39,16 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/app/combination")
 public class AppCombinationController {
-
+    
     private static Logger log = LoggerFactory.getLogger(AppCombinationController.class);
-
+    
     @Resource
     private StoreCombinationService storeCombinationService;
     @Resource
     private StoreOrderService storeOrderService;
     @Resource
     private OrderServiceBusiness orderServiceBusiness;
-
+    
     //    @PostMapping("/add")
     //    @ApiOperation(value = "拼团商品表新增")
     //    public Result add(@RequestBody StoreCombination storeCombination) {
@@ -70,7 +65,7 @@ public class AppCombinationController {
     //        }
     //        return Result.success();
     //    }
-
+    
     //    @DeleteMapping("/delete")
     //    @ApiOperation(value = "拼团商品表删除")
     //    public Result delete(@RequestParam Long id) {
@@ -96,7 +91,7 @@ public class AppCombinationController {
     //        }
     //        return Result.success();
     //    }
-
+    
     //    @PutMapping("/update")
     //    @ApiOperation(value = "拼团商品表更新")
     //    public Result update(@RequestBody StoreCombination storeCombination) {
@@ -108,7 +103,7 @@ public class AppCombinationController {
     //        }
     //        try {
     //            storeCombination.setUpdateTime(new Date());
-
+    
     /// /            storeCombination.setUpdateUserId(userId);
     //            storeCombinationService.update(storeCombination);
     //        } catch (Exception e) {
@@ -123,7 +118,7 @@ public class AppCombinationController {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-
+        
         StoreCombination storeCombination = null;
         try {
             storeCombination = storeCombinationService.findById(id);
@@ -133,7 +128,7 @@ public class AppCombinationController {
         }
         return Result.success(storeCombination);
     }
-
+    
     // @PostMapping("/app/list")
     // @ApiOperation(value = "拼团商品表获取列表")
     // public Result<List<StoreCombination>> list(@RequestBody StoreProductDTO dto) {
@@ -192,31 +187,25 @@ public class AppCombinationController {
     //     }
     //     return Result.success(pageInfo);
     // }
-
+    
     @Resource
     private StoreProductService storeProductService;
-
+    
     /**
      * 商品列表
      */
     @GetMapping("/app/list")
     public Result<PageInfo<List<StoreCombinationVO>>> spuList(@Validated SpuListRO ro, Integer page, Integer size) {
         PageHelper.startPage(page, size);
-
-       // List<StoreCombinationVO> storeCombinationVOS1 = storeCombinationService.spuList(ro);
-
+        
+        // List<StoreCombinationVO> storeCombinationVOS1 = storeCombinationService.spuList(ro);
+        
         Condition condition = new Condition(StoreCombination.class);
         Example.Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         criteria.andEqualTo("isShow", 1);
-        if(SpuSortEnum.SALES_ASC.equals(ro.getSort())){
-            condition.setOrderByClause("ficti asc");
-        }else if(SpuSortEnum.SALES_DESC.equals(ro.getSort())){
-            condition.setOrderByClause("ficti desc");
-        }else{
-            condition.setOrderByClause("ficti desc");
-        }
-
+        condition.setOrderByClause(ro.getSort().getSort());
+        
         if (StrUtil.isNotBlank(ro.getStoreName())) {
             criteria.andLike("productName", "%" + ro.getStoreName() + "%");
         }
@@ -226,24 +215,24 @@ public class AppCombinationController {
         if (ObjectUtil.isNotNull(ro.getPrice())) {
             criteria.andEqualTo("price", ro.getPrice());
         }
-
+        
         List<StoreCombination> byCondition = storeCombinationService.findByCondition(condition);
         List<StoreCombinationVO> storeCombinationVOS = new ArrayList<>();
-
-        if(!CollectionUtils.isEmpty(byCondition)){
-
+        
+        if (!CollectionUtils.isEmpty(byCondition)) {
+            
             for (StoreCombination storeCombination : byCondition) {
                 StoreCombinationVO storeCombinationVO = new StoreCombinationVO();
-                BeanUtils.copyProperties(storeCombination,storeCombinationVO);
-
+                BeanUtils.copyProperties(storeCombination, storeCombinationVO);
+                
                 storeCombinationVOS.add(storeCombinationVO);
             }
         }
-
+        
         return Result.success(new PageInfo(storeCombinationVOS));
     }
-
-
+    
+    
     @PostMapping("/addActivityProduct")
     @ApiOperation(value = "添加活动商品")
     public Result addActivityProduct(@RequestBody StoreCombinationAddParam storeCombinationAddParam) {
@@ -256,7 +245,7 @@ public class AppCombinationController {
         storeCombinationService.addActivityProduct(storeCombinationAddParam.getList(), storeCombinationAddParam.getActivityId());
         return Result.success();
     }
-
+    
     @GetMapping("/getActivityProductIds")
     @ApiOperation(value = "获取活动商品ids")
     public Result<List<Long>> getActivityProductIds(@RequestParam("activityId") Long activityId) {
@@ -268,9 +257,8 @@ public class AppCombinationController {
         List<Long> arrayList = combinationList.stream().map(StoreCombination::getProductId).collect(Collectors.toList());
         return Result.success(arrayList);
     }
-
-
-
+    
+    
     /**
      * 更多拼团
      */
@@ -288,11 +276,11 @@ public class AppCombinationController {
         }
         return Result.success(pageInfo);
     }
-
+    
     @ApiOperation(value = "排行榜")
     @GetMapping(value = "/rank")
     public Result<List<StoreCombinationRankVO>> getRank(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-      //  PageHelper.startPage(page, size);
+        //  PageHelper.startPage(page, size);
         PageInfo pageInfo = null;
         try {
             List<StoreCombinationRankVO> list = orderServiceBusiness.getRankNew();
@@ -303,6 +291,6 @@ public class AppCombinationController {
         }
         return Result.success(pageInfo);
     }
-
-
+    
+    
 }

mall-service/src/main/java/com/txz/mall/controller/appcontroller/JPushController.java

@@ -1,6 +1,7 @@
 package com.txz.mall.controller.appcontroller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.txz.mall.core.AuthService;
 import com.txz.mall.core.Result;
@@ -8,7 +9,6 @@ import com.txz.mall.model.UserJPush;
 import com.txz.mall.service.UserJPushService;
 import com.txz.mall.web.ro.JPushBindRO;
 import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,7 +36,7 @@ public class JPushController {
      * 客户端绑定用户
      */
     @PostMapping("bindUser")
-    private Result bindUser(@RequestBody @Validated JPushBindRO ro, HttpServletRequest request) {
+    private Result bindUser(@RequestBody JPushBindRO ro, HttpServletRequest request) {
         Long userId;
         try {
             userId = authService.getTokenUserId(request);
@@ -44,6 +44,11 @@ public class JPushController {
             // 未登录会抛异常，场景登录未登录均可
             userId = null;
         }
+        
+        //极光推送如果挂了，不绑定
+        if (StrUtil.isBlank(ro.getJpushDeviceId())) {
+            return Result.success();
+        }
         UserJPush device;
         // 多端推送场景注掉这儿
         if (ObjectUtil.isNotEmpty(userId)) {

mall-service/src/main/java/com/txz/mall/web/ro/JPushBindRO.java

@@ -2,8 +2,6 @@ package com.txz.mall.web.ro;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @author: MTD®️
  * @date: 2025/9/17
@@ -14,7 +12,6 @@ public class JPushBindRO {
     /**
      * 设备ID
      */
-    @NotBlank(message = "设备ID不能为空")
     private String jpushDeviceId;
     
     /**