diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar index 8f4f576..382db8a 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/entity/HotelShoppingCat.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/entity/HotelShoppingCat.java index f1cf4f6..4bc8425 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/entity/HotelShoppingCat.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/entity/HotelShoppingCat.java @@ -6,6 +6,7 @@ import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; @@ -48,6 +49,7 @@ public class HotelShoppingCat implements Serializable { @ApiModelProperty(value = "用户Id") private java.lang.String userId; /**delFlag*/ + @TableLogic @Excel(name = "delFlag", width = 15) @ApiModelProperty(value = "delFlag") private java.lang.Integer delFlag; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/mapper/xml/HotelShoppingCatMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/mapper/xml/HotelShoppingCatMapper.xml index 4b35415..1f75d0f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/mapper/xml/HotelShoppingCatMapper.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/mapper/xml/HotelShoppingCatMapper.xml @@ -3,8 +3,9 @@ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/resp/ShoppingCartPageResp.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/resp/ShoppingCartPageResp.java index f2fd518..3c26ab6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/resp/ShoppingCartPageResp.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/resp/ShoppingCartPageResp.java @@ -21,5 +21,7 @@ public class ShoppingCartPageResp { /**原价*/ private BigDecimal originalPrice; private Integer num; + private String skuId; + private String goodsId; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar index 5fa0aac..c23d8eb 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar differ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/controller/GoodsController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/controller/GoodsController.java index fdeacd6..d18bb53 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/controller/GoodsController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/controller/GoodsController.java @@ -75,4 +75,18 @@ public class GoodsController { return goodsService.addOrDeleteNum(addOrDeleteNumReq); } + @ApiOperation(value = "根据商品id获取规格") + @GetMapping("/sku") + public Result getGoodsSku(String id){ + return goodsService.getGoodsSku(id); + } + + + @ApiOperation(value = "购物车修改多规格") + @PostMapping("/shopping/cart/edit/sku") + public Result editShoppingCatByGoodsId(HttpServletRequest request , EditShoppingCatByGoodsIdReq editShoppingCatByGoodsIdReq){ + editShoppingCatByGoodsIdReq.setToken(TokenUtils.getTokenByRequest(request)); + return goodsService.editShoppingCatByGoodsId(editShoppingCatByGoodsIdReq); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/EditShoppingCatByGoodsIdReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/EditShoppingCatByGoodsIdReq.java new file mode 100644 index 0000000..d8afc7a --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/req/EditShoppingCatByGoodsIdReq.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.xcx.goods.req; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class EditShoppingCatByGoodsIdReq { + + /**购物车id*/ + @ApiModelProperty(value = "购物车id") + private String id; + /**商品id*/ + @ApiModelProperty(value = "商品id") + private String goodsId; + /**规格Id*/ + @ApiModelProperty(value = "规格Id") + private String skuId; + private String token; + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/IGoodsService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/IGoodsService.java index 75f2cef..3e79979 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/IGoodsService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/IGoodsService.java @@ -47,4 +47,18 @@ public interface IGoodsService { */ Result addOrDeleteNum(AddOrDeleteNumReq addOrDeleteNumReq); + /** + * 获取商品多规格 + * @param id + * @return + */ + Result getGoodsSku(String id); + + /** + * 修改购物车的多规格 + * @param editShoppingCatByGoodsIdReq + * @return + */ + Result editShoppingCatByGoodsId(EditShoppingCatByGoodsIdReq editShoppingCatByGoodsIdReq); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/impl/GoodsServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/impl/GoodsServiceImpl.java index f42ca35..c7a990f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/impl/GoodsServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/goods/service/impl/GoodsServiceImpl.java @@ -24,6 +24,7 @@ import org.jeecgframework.codegenerate.a.a; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; @Service @@ -150,14 +151,15 @@ public class GoodsServiceImpl implements IGoodsService { public Result deleteShoppingCart(DeleteShoppingCartReq deleteShoppingCartReq) { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(deleteShoppingCartReq.getToken()); - HotelShoppingCat hotelShoppingCat = hotelShoppingCatService.lambdaQuery() - .eq(HotelShoppingCat::getId, deleteShoppingCartReq.getId()) - .eq(HotelShoppingCat::getUserId, hanHaiMember.getId()) - .one(); - if(hotelShoppingCat == null){ - throw new JeecgBootException("购物车数据错误,请刷新重试"); - } - hotelShoppingCatService.removeById(hotelShoppingCat.getId()); +// HotelShoppingCat hotelShoppingCat = hotelShoppingCatService.lambdaQuery() +// .eq(HotelShoppingCat::getId, deleteShoppingCartReq.getId()) +// .eq(HotelShoppingCat::getUserId, hanHaiMember.getId()) +// .one(); +// if(hotelShoppingCat == null){ +// throw new JeecgBootException("购物车数据错误,请刷新重试"); +// } + + hotelShoppingCatService.removeBatchByIds(Arrays.asList(deleteShoppingCartReq.getId().split(","))); return Result.OK(); } @@ -203,4 +205,37 @@ public class GoodsServiceImpl implements IGoodsService { redisUtil.set("addOrDeleteNumReq:"+addOrDeleteNumReq.getToken(),1,1); return Result.OK(); } + + /** + * 获取商品多规格 + * @param id + * @return + */ + @Override + public Result getGoodsSku(String id) { + List hotelGoodsSkuList = hotelGoodsSkuService.lambdaQuery() + .eq(HotelGoodsSku::getGoodsId, id) + .eq(HotelGoodsSku::getDelFlag, 0) + .list(); + return Result.OK(hotelGoodsSkuList); + } + + @Override + public Result editShoppingCatByGoodsId(EditShoppingCatByGoodsIdReq editShoppingCatByGoodsIdReq) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(editShoppingCatByGoodsIdReq.getToken()); + HotelShoppingCat hotelShoppingCat = hotelShoppingCatService.lambdaQuery() + .eq(HotelShoppingCat::getDelFlag, 0) + .eq(HotelShoppingCat::getGoodsId, editShoppingCatByGoodsIdReq.getGoodsId()) + .eq(HotelShoppingCat::getUserId, hanHaiMember.getId()) + .eq(HotelShoppingCat::getId, editShoppingCatByGoodsIdReq.getId()) + .one(); + if(hotelShoppingCat == null){ + throw new JeecgBootException("数据错误，请稍后重试"); + } + HotelShoppingCat hotelShoppingCat1 = new HotelShoppingCat(); + hotelShoppingCat1.setId(hotelShoppingCat.getId()); + hotelShoppingCat1.setSkuId(editShoppingCatByGoodsIdReq.getSkuId()); + hotelShoppingCatService.updateById(hotelShoppingCat1); + return Result.OK(); + } } diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 96bc999..e979bf8 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -134,7 +134,7 @@ spring: # connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://124.220.65.222:3306/hotel-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false + url: jdbc:mysql://127.0.0.1:3306/hotel-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false username: root password: m`A_E+`m driver-class-name: com.mysql.cj.jdbc.Driver @@ -147,7 +147,7 @@ spring: #redis 配置 redis: database: 0 - host: 124.220.65.222 + host: 127.0.0.1 lettuce: pool: max-active: -1 #最大连接数据库连接数,设 -1 为没有限制 @@ -332,4 +332,4 @@ third-app: weixin: mpAppId: wxad5b3d20a75974c0 mpAppSecret: 3b60a80c8e673986dd42f3cd6f2cf6b1 - orderNotifyUrl: http://dev.java996.icu/hotel/order/notify \ No newline at end of file + orderNotifyUrl: https://hotel.java996.icu/hotel/order/notify \ No newline at end of file