Skip to content

Z
zion
提交 9495e71d authored 作者: zgy's avatar zgy
浏览文件
操作

修改bug

上级 d003297b
隐藏空白字符变更
内嵌 并排
正在显示 包含 61 行增加 和 103 行删除
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfCartRecordRDao.java
浏览文件 @ 9495e71d
...@@ -22,10 +22,7 @@ public interface TbCfCartRecordRDao extends BaseDao<TbCfCartRecordREntity> { ...@@ -22,10 +22,7 @@ public interface TbCfCartRecordRDao extends BaseDao<TbCfCartRecordREntity> {
*/ */
int deleteItems(String[] cartRecordIds); int deleteItems(String[] cartRecordIds);
TbCfCartRecordREntity queryByItemId(@Param("itemId") String itemId,@Param("userId") String userId,@Param("itemSku") String itemSku); TbCfCartRecordREntity queryByItemId(String itemId);
TbCfCartRecordREntity querySkuAndUrl( @Param("itemSku") String itemSku, @Param("itemId") String itemId, @Param("sourceItemId") String sourceItemId, @Param("userId") String userId);
int queryItemNum(String userId);
TbCfCartRecordREntity querySkuAndUrl(@Param("itemSku") String itemSku,@Param("sourceItemId") String sourceItemId);
} }
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfItemDetailDao.java
浏览文件 @ 9495e71d
...@@ -18,21 +18,19 @@ public interface TbCfItemDetailDao extends BaseDao<TbCfItemDetailEntity> { ...@@ -18,21 +18,19 @@ public interface TbCfItemDetailDao extends BaseDao<TbCfItemDetailEntity> {
/** /**
* 根据用户id获取购物车内物品 * 根据用户id获取购物车内物品
*
* @param userId * @param userId
* @return * @return
*/ */
List<TbCfCartItemDetailVo> getCartItemList(String userId, Integer checkFlag); List<TbCfCartItemDetailVo> getCartItemList(String userId,Integer checkFlag);
/** /**
* 改变购物车的商品勾选状态 * 改变购物车的商品勾选状态
*
* @param cartRecordId * @param cartRecordId
* @param checkFlag * @param checkFlag
* @return * @return
*/ */
int changeItemState(String cartRecordId, Integer checkFlag); int changeItemState(String cartRecordId, Integer checkFlag);
int queryItemNum(String userId);
int changeState(@Param("ids") String[] ids, @Param("checkFlag") String checkFlag); int changeState(@Param("ids") String[] ids, @Param("checkFlag") String checkFlag);
} }
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfItemDetailServiceImpl.java
浏览文件 @ 9495e71d
...@@ -101,11 +101,6 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService { ...@@ -101,11 +101,6 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
public Result addToCart(TbCfItemDetailVo tbCfItemDetailVo) throws InterruptedException, ExecutionException, TimeoutException { public Result addToCart(TbCfItemDetailVo tbCfItemDetailVo) throws InterruptedException, ExecutionException, TimeoutException {
String token = jwtTokenProvider.resolveToken(request); String token = jwtTokenProvider.resolveToken(request);
TbCfUserInfoVo tbCfUserInfoVo = tokenManager.validate(token); TbCfUserInfoVo tbCfUserInfoVo = tokenManager.validate(token);
int itemCount = tbCfItemDetailDao.queryItemNum(tbCfUserInfoVo.getUserId());
System.out.println(itemCount);
if(itemCount>=99){
return new Result(ResultCodeEnum.ERROR.getCode()).setMessage("The shopping cart is full and needs to be cleaned！");
}
boolean flag = false; boolean flag = false;
if (tbCfItemDetailVo.getItemPrice() != null) { if (tbCfItemDetailVo.getItemPrice() != null) {
int compare = tbCfItemDetailVo.getItemPrice().compareTo(BigDecimal.ZERO); int compare = tbCfItemDetailVo.getItemPrice().compareTo(BigDecimal.ZERO);
...@@ -115,26 +110,14 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService { ...@@ -115,26 +110,14 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
} }
if (flag) { if (flag) {
//填充新商品必要信息 //填充新商品必要信息
TbCfCartRecordREntity tbCfCartRecord = tbCfCartRecordRDao.querySkuAndUrl(tbCfItemDetailVo.getItemSku(),tbCfItemDetailVo.getItemId(), tbCfItemDetailVo.getSourceItemId(),tbCfUserInfoVo.getUserId()); TbCfCartRecordREntity tbCfCartRecord = tbCfCartRecordRDao.querySkuAndUrl(tbCfItemDetailVo.getItemSku(), tbCfItemDetailVo.getSourceItemId());
if(tbCfItemDetailVo.getSourceItemId().equals("www.afrieshop.com")) { if (tbCfCartRecord != null) {
if (tbCfCartRecord != null) { tbCfItemDetailVo.setItemId(tbCfCartRecord.getItemId());
tbCfItemDetailVo.setItemId(tbCfCartRecord.getItemId()); tbCfItemDetailVo.setItemNum(tbCfCartRecord.getItemNum() + tbCfItemDetailVo.getItemNum());
tbCfItemDetailVo.setItemNum(tbCfCartRecord.getItemNum() + tbCfItemDetailVo.getItemNum()); tbCfItemDetailVo.setCreateTime(new Date());
tbCfItemDetailVo.setCreateTime(new Date()); } else {
}else{ tbCfItemDetailVo.setItemId(IdUtil.createIdbyUUID());
tbCfItemDetailVo.setItemId(tbCfItemDetailVo.getItemId()); tbCfItemDetailVo.setCreateTime(new Date());
tbCfItemDetailVo.setItemNum(tbCfItemDetailVo.getItemNum());
tbCfItemDetailVo.setCreateTime(new Date());
}
}else{
if (tbCfCartRecord != null) {
tbCfItemDetailVo.setItemId(tbCfCartRecord.getItemId());
tbCfItemDetailVo.setItemNum(tbCfCartRecord.getItemNum() + tbCfItemDetailVo.getItemNum());
tbCfItemDetailVo.setCreateTime(new Date());
}else{
tbCfItemDetailVo.setItemId(IdUtil.createIdbyUUID());
tbCfItemDetailVo.setCreateTime(new Date());
}
} }
//为商品分类,后面计算运费 //为商品分类,后面计算运费
TbCfExpressTemplateEntity expressTemplate = recognizeItemCategory(tbCfItemDetailVo.getItemTitle()); TbCfExpressTemplateEntity expressTemplate = recognizeItemCategory(tbCfItemDetailVo.getItemTitle());
...@@ -143,20 +126,8 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService { ...@@ -143,20 +126,8 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
TbCfItemDetailEntity tbCfItemDetail = new TbCfItemDetailEntity(); TbCfItemDetailEntity tbCfItemDetail = new TbCfItemDetailEntity();
BeanUtils.copyProperties(tbCfItemDetailVo, tbCfItemDetail); BeanUtils.copyProperties(tbCfItemDetailVo, tbCfItemDetail);
//将商品加入购物车表 //将商品加入购物车表
TbCfCartRecordREntity tbCfCartRecordREntity1 = tbCfCartRecordRDao.queryByItemId(tbCfItemDetailVo.getItemId(),tbCfUserInfoVo.getUserId(),tbCfItemDetailVo.getItemSku()); TbCfCartRecordREntity tbCfCartRecordREntity1 = tbCfCartRecordRDao.queryByItemId(tbCfItemDetailVo.getItemId());
if (tbCfCartRecordREntity1!=null) { if (tbCfCartRecordREntity1 == null) {
TbCfCartRecordREntity tbCfCartRecordREntity = new TbCfCartRecordREntity();
tbCfCartRecordREntity.setCartRecordId(tbCfCartRecordREntity1.getCartRecordId());
tbCfCartRecordREntity.setItemId(tbCfItemDetailVo.getItemId());
tbCfCartRecordREntity.setCheckFlag(StateConstant.VALID);
tbCfCartRecordREntity.setEnableFlag(StateConstant.VALID);
tbCfCartRecordREntity.setUserId(tbCfCartRecordREntity1.getUserId());
tbCfCartRecordREntity.setCreateTime(new Date());
tbCfCartRecordREntity.setItemNum(tbCfItemDetailVo.getItemNum());
tbCfCartRecordRDao.update(tbCfCartRecordREntity);
tbCfItemDetailDao.update(tbCfItemDetail);
} else {
tbCfItemDetailDao.save(tbCfItemDetail); tbCfItemDetailDao.save(tbCfItemDetail);
TbCfCartRecordREntity tbCfCartRecordREntity = new TbCfCartRecordREntity(); TbCfCartRecordREntity tbCfCartRecordREntity = new TbCfCartRecordREntity();
tbCfCartRecordREntity.setCartRecordId(IdUtil.createIdbyUUID()); tbCfCartRecordREntity.setCartRecordId(IdUtil.createIdbyUUID());
...@@ -169,6 +140,17 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService { ...@@ -169,6 +140,17 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
tbCfCartRecordREntity.setItemSku(tbCfItemDetailVo.getItemSku()); tbCfCartRecordREntity.setItemSku(tbCfItemDetailVo.getItemSku());
tbCfCartRecordREntity.setSourceItemId(tbCfItemDetailVo.getSourceItemId()); tbCfCartRecordREntity.setSourceItemId(tbCfItemDetailVo.getSourceItemId());
tbCfCartRecordRDao.save(tbCfCartRecordREntity); tbCfCartRecordRDao.save(tbCfCartRecordREntity);
} else {
tbCfItemDetailDao.update(tbCfItemDetail);
TbCfCartRecordREntity tbCfCartRecordREntity = new TbCfCartRecordREntity();
tbCfCartRecordREntity.setCartRecordId(tbCfCartRecordREntity1.getCartRecordId());
tbCfCartRecordREntity.setItemId(tbCfItemDetailVo.getItemId());
tbCfCartRecordREntity.setCheckFlag(StateConstant.VALID);
tbCfCartRecordREntity.setEnableFlag(StateConstant.VALID);
tbCfCartRecordREntity.setUserId(tbCfUserInfoVo.getUserId());
tbCfCartRecordREntity.setCreateTime(new Date());
tbCfCartRecordREntity.setItemNum(tbCfItemDetailVo.getItemNum());
tbCfCartRecordRDao.update(tbCfCartRecordREntity);
} }
return new Result(ResultCodeEnum.SUCCESS.getDesc()); return new Result(ResultCodeEnum.SUCCESS.getDesc());
} else { } else {
...@@ -176,6 +158,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService { ...@@ -176,6 +158,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
} }
} }
@Override @Override
public Result insertItemDetail(TbCfItemDetailVo tbCfItemDetailVo) { public Result insertItemDetail(TbCfItemDetailVo tbCfItemDetailVo) {
Result result = new Result(); Result result = new Result();
......
src/main/resources/mapper/TbCfCartRecordRDao.xml
浏览文件 @ 9495e71d
...@@ -124,47 +124,28 @@ ...@@ -124,47 +124,28 @@
</delete> </delete>
<select id="querySkuAndUrl" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity"> <select id="querySkuAndUrl" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
select select
`cart_record_id`, `cart_record_id`,
`item_id`, `item_id`,
`user_id`, `user_id`,
`check_flag`, `check_flag`,
`enable_flag`, `enable_flag`,
`create_time`, `create_time`,
`source_item_id`, `source_item_id`,
`item_sku`, `item_sku`,
`item_num` `item_num`
from tb_cf_cart_record_r from tb_cf_cart_record_r
where 1=1 where item_sku =#{itemSku} and source_item_id=#{sourceItemId} and enable_flag=1
and user_id=#{userId}
and enable_flag=1
<if test="itemSku != null and itemSku.trim() != ''">
and item_sku =#{itemSku}
</if>
<if test="sourceItemId != null and sourceItemId.trim() != ''">
and source_item_id=#{sourceItemId}
</if>
<if test="itemId != null and itemId.trim() != ''">
and item_id=#{itemId}
</if>
</select> </select>
<select id="queryByItemId" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity"> <select id="queryByItemId" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
select `cart_record_id`, select `cart_record_id`,
`item_id`, `item_id`,
`user_id`, `user_id`,
`check_flag`, `check_flag`,
`enable_flag`, `enable_flag`,
`create_time`, `create_time`,
`source_item_id`, `source_item_id`,
`item_sku`, `item_sku`,
`item_num` from tb_cf_cart_record_r where 1=1 `item_num` from tb_cf_cart_record_r where item_id =#{itemId} and enable_flag=1
and enable_flag=1
and user_id=#{userId}
and item_id =#{itemId}
<if test="itemSku != null and itemSku.trim() != ''">
and item_sku =#{itemSku}
</if>
</select> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/TbCfItemDetailDao.xml
浏览文件 @ 9495e71d
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<if test="shopUrl != null">`shop_url` = #{shopUrl},</if> <if test="shopUrl != null">`shop_url` = #{shopUrl},</if>
<if test="createTime != null">`create_time` = #{createTime}</if> <if test="createTime != null">`create_time` = #{createTime}</if>
</set> </set>
where item_id = #{itemId} and item_sku=#{itemSku} where item_id = #{itemId}
</update> </update>
<delete id="delete"> <delete id="delete">
...@@ -163,26 +163,25 @@ ...@@ -163,26 +163,25 @@
</foreach> </foreach>
</delete> </delete>
<!--获取用户购物车内商品--> <!--获取用户购物车内商品-->
<select id="getCartItemList" resultType="com.diaoyun.zion.chinafrica.vo.TbCfCartItemDetailVo"> <select id="getCartItemList" resultType="com.diaoyun.zion.chinafrica.vo.TbCfCartItemDetailVo">
select t1.cart_record_id,t1.check_flag,t2.* from tb_cf_cart_record_r t1,tb_cf_item_detail t2 where select t1.cart_record_id,t1.check_flag,t2.* from tb_cf_cart_record_r t1,tb_cf_item_detail t2 where t1.item_id=t2.item_id
t1.item_id=t2.item_id and t1.user_id=#{userId} and t2.item_price is not null
and t1.user_id=#{userId} and t2.item_price is not null <if test="checkFlag != null"> and t1.check_flag = #{checkFlag}</if>
<if test="checkFlag != null">and t1.check_flag = #{checkFlag}</if> and t1.enable_flag=1 order by t2.create_time desc
and t1.enable_flag=1 order by t2.create_time desc </select>
</select>
<!--改变购物车的商品勾选状态（旧版）--> <!--改变购物车的商品勾选状态-->
<update id="changeItemState"> <update id="changeItemState">
update tb_cf_cart_record_r set check_flag=#{checkFlag} where cart_record_id=#{cartRecordId} update tb_cf_cart_record_r set check_flag=#{checkFlag} where cart_record_id=#{cartRecordId}
</update> </update>
<!--改变购物车商品勾选状态（新版）--> <!--改变购物车商品勾选状态（新版）-->
<update id="changeState"> <update id="changeState">
update tb_cf_cart_record_r set check_flag=#{checkFlag} where cart_record_id in update tb_cf_cart_record_r set check_flag=#{checkFlag} where cart_record_id in
<foreach item="id" collection="ids" open="(" separator="," close=")"> <foreach item="id" collection="ids" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</update> </update>
</mapper> </mapper>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论