Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderBaseVO.java

@@ -32,7 +32,7 @@ public class RechargeOrderBaseVO {
 
     @Schema(description = "用户id", required = true, example = "28969")
     @NotNull(message = "用户id不能为空")
-    private Integer uid;
+    private Long uid;
 
     @Schema(description = "用户姓名", required = true, example = "张三")
     @NotNull(message = "用户姓名不能为空")

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderExportReqVO.java

@@ -22,7 +22,7 @@ public class RechargeOrderExportReqVO {
     private Long tenantId;
 
     @Schema(description = "用户id", example = "28969")
-    private Integer uid;
+    private Long uid;
 
     @Schema(description = "用户姓名", example = "张三")
     private String realName;

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderPageReqVO.java

@@ -24,7 +24,7 @@ public class RechargeOrderPageReqVO extends PageParam {
     private Long tenantId;
 
     @Schema(description = "用户id", example = "28969")
-    private Integer uid;
+    private Long uid;
 
     @Schema(description = "用户姓名", example = "张三")
     private String realName;

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/AppPhoneRecordController.java

@@ -37,42 +37,4 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
 @Slf4j
 public class AppPhoneRecordController {
 
-    @Resource
-    private PhoneRecordService phoneRecordService;
-
-
-    @Value("${phone.query-url}")
-    private String phoneUrl;
-
-    @Value("${phone.token}")
-    private String token;
-
-
-    @PostMapping("test")
-    public CommonResult<Boolean> test(@RequestBody List<PhoneRecordAdd> data){
-        String result = HttpRequest.post(phoneUrl+"query/createReport")
-                .header("token",token)
-                .body(JSONObject.toJSONString(data))
-                .execute()
-                .body();
-        JSONObject resultJson = JSONObject.parseObject(result);
-        log.info("提报新增返回结果{}",JSONObject.toJSONString(resultJson));
-        if("0000".equals(resultJson.get("code"))){
-            return success(null);
-        }
-        return success(null);
-    }
-    @PostMapping("delete")
-    public CommonResult<Boolean> delete(@RequestBody String data){
-        String result = HttpRequest.post(phoneUrl+"query/deleteReport?orderNo="+data)
-                .header("token",token)
-                .execute()
-                .body();
-        JSONObject resultJson = JSONObject.parseObject(result);
-        log.info("删除返回结果{}",JSONObject.toJSONString(resultJson));
-        if("0000".equals(resultJson.get("code"))){
-            return success(null);
-        }
-        return success(null);
-    }
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/log/StoreProductLog.java

@@ -43,7 +43,7 @@ public class StoreProductLog implements Serializable {
     private Integer productId;
 
     @Schema(description= "用户ID")
-    private Integer uid;
+    private Long uid;
 
     @Schema(description= "是否浏览")
     private Boolean visitNum;

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/order/StoreOrderMapper.java

@@ -70,5 +70,5 @@ public interface StoreOrderMapper extends BaseMapperX<StoreOrder> {
      * @param uid 用户uid
      * @param spreadId 推广人uid
      */
-    OrderBrokerageData getBrokerageData(@Param("uid") Integer uid, @Param("spreadId") Integer spreadId);
+    OrderBrokerageData getBrokerageData(@Param("uid") Long uid, @Param("spreadId") Integer spreadId);
 }

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/StoreOrderService.java

@@ -66,7 +66,7 @@ public interface StoreOrderService extends IService<StoreOrder> {
      * @param pageParamRequest 分页参数
      * @return 订单结果列表
      */
-    List<StoreOrder> getUserOrderList(Integer uid, Integer status, PageParam pageParamRequest);
+    List<StoreOrder> getUserOrderList(Long uid, Integer status, PageParam pageParamRequest);
     /**
      * 创建订单
      * @param storeOrder 订单参数
@@ -141,21 +141,21 @@ public interface StoreOrderService extends IService<StoreOrder> {
      * @param seckillId 秒杀商品id
      * @return 用户当天的秒杀商品订单数量
      */
-    List<StoreOrder> getUserCurrentDaySecKillOrders(Integer uid, Integer seckillId);
+    List<StoreOrder> getUserCurrentDaySecKillOrders(Long uid, Integer seckillId);
 
     /**
      * 获取用户当前的砍价订单
      * @param uid    用户uid
      * @return  用户当前的砍价订单
      */
-    List<StoreOrder> getUserCurrentBargainOrders(Integer uid, Integer bargainId);
+    List<StoreOrder> getUserCurrentBargainOrders(Long uid, Integer bargainId);
 
     /**
      * 获取用户当前的拼团订单
      * @param uid    用户uid
      * @return  用户当前的拼团订单
      */
-    List<StoreOrder> getUserCurrentCombinationOrders(Integer uid, Integer combinationId);
+    List<StoreOrder> getUserCurrentCombinationOrders(Long uid, Integer combinationId);
 
     StoreOrder getByOderId(String orderId);
 
@@ -206,7 +206,7 @@ public interface StoreOrderService extends IService<StoreOrder> {
      * @param uid 用户uid
      * @return Integer
      */
-    Long getOrderCountByUid(Integer uid);
+    Long getOrderCountByUid(Long uid);
 
     /**
      * 获取用户总消费金额
@@ -220,7 +220,7 @@ public interface StoreOrderService extends IService<StoreOrder> {
      * @param uid 用户uid
      * @return Integer
      */
-    Long getOrderCountByUidAndDate(Integer uid, String date);
+    Long getOrderCountByUidAndDate(Long uid, String date);
 
     /**
      * 获取用户消费金额(时间)
@@ -380,7 +380,7 @@ public interface StoreOrderService extends IService<StoreOrder> {
      * @param uid 用户uid
      * @param spreadId 推广人uid
      */
-    OrderBrokerageData getBrokerageData(Integer uid, Integer spreadId);
+    OrderBrokerageData getBrokerageData(Long uid, Integer spreadId);
 
     /**
      * 会员充值

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java

@@ -231,7 +231,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
      * @return 订单结果列表
      */
     @Override
-    public List<StoreOrder> getUserOrderList(Integer uid, Integer status, PageParam pageParamRequest) {
+    public List<StoreOrder> getUserOrderList(Long uid, Integer status, PageParam pageParamRequest) {
         PageHelper.startPage(pageParamRequest.getPageNo(), pageParamRequest.getPageSize());
         LambdaQueryWrapper<StoreOrder> lqw = new LambdaQueryWrapper<>();
         orderUtil.statusApiByWhere(lqw, status);
@@ -541,7 +541,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
      * @return 用户当天的秒杀商品订单数量
      */
     @Override
-    public List<StoreOrder> getUserCurrentDaySecKillOrders(Integer uid, Integer seckillId) {
+    public List<StoreOrder> getUserCurrentDaySecKillOrders(Long uid, Integer seckillId) {
         String dayStart = DateUtils.nowDateTime(Constants.DATE_FORMAT_START);
         String dayEnd = DateUtils.nowDateTime(Constants.DATE_FORMAT_END);
         LambdaQueryWrapper<StoreOrder> lqw = Wrappers.lambdaQuery();
@@ -560,7 +560,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
      * @return 用户当前的砍价订单
      */
     @Override
-    public List<StoreOrder> getUserCurrentBargainOrders(Integer uid, Integer bargainId) {
+    public List<StoreOrder> getUserCurrentBargainOrders(Long uid, Integer bargainId) {
         LambdaQueryWrapper<StoreOrder> lqw = Wrappers.lambdaQuery();
         lqw.eq(StoreOrder::getUid, uid);
         lqw.eq(StoreOrder::getBargainId, bargainId);
@@ -576,7 +576,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
      * @return 用户当前的拼团订单
      */
     @Override
-    public List<StoreOrder> getUserCurrentCombinationOrders(Integer uid, Integer combinationId) {
+    public List<StoreOrder> getUserCurrentCombinationOrders(Long uid, Integer combinationId) {
         LambdaQueryWrapper<StoreOrder> lqw = Wrappers.lambdaQuery();
         lqw.eq(StoreOrder::getUid, uid);
         lqw.eq(StoreOrder::getCombinationId, combinationId);
@@ -724,7 +724,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
      * @return Integer
      */
     @Override
-    public Long getOrderCountByUid(Integer uid) {
+    public Long getOrderCountByUid(Long uid) {
         LambdaQueryWrapper<StoreOrder> lqw = Wrappers.lambdaQuery();
         lqw.eq(StoreOrder::getPaid, true);
         lqw.eq(StoreOrder::getIsDel, false);
@@ -759,7 +759,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
      * @return Integer
      */
     @Override
-    public Long getOrderCountByUidAndDate(Integer uid, String date) {
+    public Long getOrderCountByUidAndDate(Long uid, String date) {
         LambdaQueryWrapper<StoreOrder> lqw = Wrappers.lambdaQuery();
         lqw.eq(StoreOrder::getPaid, true);
         lqw.eq(StoreOrder::getIsDel, false);
@@ -1165,7 +1165,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
      * @param spreadId 推广人uid
      */
     @Override
-    public OrderBrokerageData getBrokerageData(Integer uid, Integer spreadId) {
+    public OrderBrokerageData getBrokerageData(Long uid, Integer spreadId) {
         return null;
     }
 

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/product/StoreProductRelationService.java

@@ -53,7 +53,7 @@ public interface StoreProductRelationService extends IService<StoreProductRelati
      * @param uid 用户uid
      * @return 收藏数量
      */
-    Integer getCollectCountByUid(Integer uid);
+    Integer getCollectCountByUid(Long uid);
 
     /**
      * 根据商品Id取消收藏

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/product/impl/StoreProductRelationServiceImpl.java

@@ -159,7 +159,7 @@ public class StoreProductRelationServiceImpl extends ServiceImpl<StoreProductRel
      * @return 收藏数量
      */
     @Override
-    public Integer getCollectCountByUid(Integer uid) {
+    public Integer getCollectCountByUid(Long uid) {
         LambdaQueryWrapper<StoreProductRelation> lqr = Wrappers.lambdaQuery();
         lqr.eq(StoreProductRelation::getUid, uid);
         lqr.eq(StoreProductRelation::getType,"collect");