统一提交代码

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;

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/mapper/xml/HotelShoppingCatMapper.xml

@@ -3,8 +3,9 @@
 <mapper namespace="org.jeecg.modules.hotelshoppingcat.mapper.HotelShoppingCatMapper">
 
     <select id="getShoppingCartPage" resultType="org.jeecg.modules.hotelshoppingcat.resp.ShoppingCartPageResp">
-        select a.id,b.name,b.pic,c.title,c.price,c.deposit_price,c.original_price,a.num from hotel_shopping_cat a left join hotel_goods b on a.goods_id = b.id
-                                                                                                       left join hotel_goods_sku c on a.sku_id = c.id
+        select a.id,b.name,b.pic,c.title,c.price,c.deposit_price,c.original_price,a.num,a.sku_id,a.goods_id
+        from hotel_shopping_cat a left join hotel_goods b on a.goods_id = b.id
+        left join hotel_goods_sku c on a.sku_id = c.id
         where a.del_flag = 0 and a.user_id = #{userId} order by a.create_time desc
     </select>
 

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;
 
 }

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);
+    }
+
 }

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;
+
+
+}

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);
+
 }

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<HotelGoodsSku> 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();
+    }
 }

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
+  orderNotifyUrl: https://hotel.java996.icu/hotel/order/notify