Unverified Commit 324c8da3 authored by linlinjava's avatar linlinjava Committed by GitHub
Browse files

Merge branch 'master' into dev

parents 693cf5cd 4c46da9b
......@@ -56,12 +56,6 @@ public class LitemallCouponService {
return couponMapper.selectByExampleSelective(criteria.example(), result);
}
public int queryTotal() {
LitemallCouponExample example = new LitemallCouponExample();
example.or().andTypeEqualTo(CouponConstant.TYPE_COMMON).andStatusEqualTo(CouponConstant.STATUS_NORMAL).andDeletedEqualTo(false);
return (int) couponMapper.countByExample(example);
}
public List<LitemallCoupon> queryAvailableList(Integer userId, int offset, int limit) {
assert userId != null;
// 过滤掉登录账号已经领取过的coupon
......
......@@ -35,4 +35,13 @@ public class LitemallGoodsAttributeService {
example.or().andGoodsIdEqualTo(gid);
goodsAttributeMapper.logicalDeleteByExample(example);
}
public void deleteById(Integer id) {
goodsAttributeMapper.logicalDeleteByPrimaryKey(id);
}
public void updateById(LitemallGoodsAttribute attribute) {
attribute.setUpdateTime(LocalDateTime.now());
goodsAttributeMapper.updateByPrimaryKeySelective(attribute);
}
}
......@@ -57,4 +57,9 @@ public class LitemallGoodsProductService {
public int reduceStock(Integer id, Short num){
return goodsProductMapper.reduceStock(id, num);
}
public void updateById(LitemallGoodsProduct product) {
product.setUpdateTime(LocalDateTime.now());
litemallGoodsProductMapper.updateByPrimaryKeySelective(product);
}
}
\ No newline at end of file
......@@ -11,6 +11,7 @@ import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@Service
......@@ -126,10 +127,13 @@ public class LitemallGoodsService {
return goodsMapper.selectByExampleSelective(example, columns);
}
public List<LitemallGoods> querySelective(String goodsSn, String name, Integer page, Integer size, String sort, String order) {
public List<LitemallGoods> querySelective(Integer goodsId, String goodsSn, String name, Integer page, Integer size, String sort, String order) {
LitemallGoodsExample example = new LitemallGoodsExample();
LitemallGoodsExample.Criteria criteria = example.createCriteria();
if (goodsId != null) {
criteria.andIdEqualTo(goodsId);
}
if (!StringUtils.isEmpty(goodsSn)) {
criteria.andGoodsSnEqualTo(goodsSn);
}
......@@ -247,4 +251,10 @@ public class LitemallGoodsService {
example.or().andNameEqualTo(name).andIsOnSaleEqualTo(true).andDeletedEqualTo(false);
return goodsMapper.countByExample(example) != 0;
}
public List<LitemallGoods> queryByIds(Integer[] ids) {
LitemallGoodsExample example = new LitemallGoodsExample();
example.or().andIdIn(Arrays.asList(ids)).andIsOnSaleEqualTo(true).andDeletedEqualTo(false);
return goodsMapper.selectByExampleSelective(example, columns);
}
}
......@@ -80,6 +80,11 @@ public class LitemallGoodsSpecificationService {
return specificationVoList;
}
public void updateById(LitemallGoodsSpecification specification) {
specification.setUpdateTime(LocalDateTime.now());
goodsSpecificationMapper.updateByPrimaryKeySelective(specification);
}
private class VO {
private String name;
private List<LitemallGoodsSpecification> valueList;
......
......@@ -7,6 +7,7 @@ import org.linlinjava.litemall.db.dao.LitemallGrouponRulesMapper;
import org.linlinjava.litemall.db.domain.LitemallGoods;
import org.linlinjava.litemall.db.domain.LitemallGrouponRules;
import org.linlinjava.litemall.db.domain.LitemallGrouponRulesExample;
import org.linlinjava.litemall.db.util.GrouponConstant;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......@@ -36,10 +37,8 @@ public class LitemallGrouponRulesService {
* @param id
* @return
*/
public LitemallGrouponRules queryById(Integer id) {
LitemallGrouponRulesExample example = new LitemallGrouponRulesExample();
example.or().andIdEqualTo(id).andDeletedEqualTo(false);
return mapper.selectOneByExample(example);
public LitemallGrouponRules findById(Integer id) {
return mapper.selectByPrimaryKey(id);
}
/**
......@@ -50,47 +49,43 @@ public class LitemallGrouponRulesService {
*/
public List<LitemallGrouponRules> queryByGoodsId(Integer goodsId) {
LitemallGrouponRulesExample example = new LitemallGrouponRulesExample();
example.or().andGoodsIdEqualTo(goodsId).andDeletedEqualTo(false);
example.or().andGoodsIdEqualTo(goodsId).andStatusEqualTo(GrouponConstant.RULE_STATUS_ON).andDeletedEqualTo(false);
return mapper.selectByExample(example);
}
public int countByGoodsId(Integer goodsId) {
LitemallGrouponRulesExample example = new LitemallGrouponRulesExample();
example.or().andGoodsIdEqualTo(goodsId).andStatusEqualTo(GrouponConstant.RULE_STATUS_ON).andDeletedEqualTo(false);
return (int)mapper.countByExample(example);
}
public List<LitemallGrouponRules> queryByStatus(Short status) {
LitemallGrouponRulesExample example = new LitemallGrouponRulesExample();
example.or().andStatusEqualTo(status).andDeletedEqualTo(false);
return mapper.selectByExample(example);
}
/**
* 获取首页团购活动列表
* 获取首页团购规则列表
*
* @param offset
* @param page
* @param limit
* @return
*/
public List<Map<String, Object>> queryList(int offset, int limit) {
return queryList(offset, limit, "add_time", "desc");
public List<LitemallGrouponRules> queryList(Integer page, Integer limit) {
return queryList(page, limit, "add_time", "desc");
}
public List<Map<String, Object>> queryList(int offset, int limit, String sort, String order) {
public List<LitemallGrouponRules> queryList(Integer page, Integer limit, String sort, String order) {
LitemallGrouponRulesExample example = new LitemallGrouponRulesExample();
example.or().andDeletedEqualTo(false);
example.or().andStatusEqualTo(GrouponConstant.RULE_STATUS_ON).andDeletedEqualTo(false);
example.setOrderByClause(sort + " " + order);
PageHelper.startPage(offset, limit);
List<LitemallGrouponRules> grouponRules = mapper.selectByExample(example);
List<Map<String, Object>> grouponList = new ArrayList<>(grouponRules.size());
for (LitemallGrouponRules rule : grouponRules) {
Integer goodsId = rule.getGoodsId();
LitemallGoods goods = goodsMapper.selectByPrimaryKeySelective(goodsId, goodsColumns);
if (goods == null)
continue;
Map<String, Object> item = new HashMap<>();
item.put("goods", goods);
item.put("groupon_price", goods.getRetailPrice().subtract(rule.getDiscount()));
item.put("groupon_member", rule.getDiscountMember());
grouponList.add(item);
}
return grouponList;
PageHelper.startPage(page, limit);
return mapper.selectByExample(example);
}
/**
* 判断某个团购活动是否已经过期
* 判断某个团购规则是否已经过期
*
* @return
*/
......@@ -99,7 +94,7 @@ public class LitemallGrouponRulesService {
}
/**
* 获取团购活动列表
* 获取团购规则列表
*
* @param goodsId
* @param page
......
......@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
import org.linlinjava.litemall.db.dao.LitemallGrouponMapper;
import org.linlinjava.litemall.db.domain.LitemallGroupon;
import org.linlinjava.litemall.db.domain.LitemallGrouponExample;
import org.linlinjava.litemall.db.util.GrouponConstant;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......@@ -24,7 +25,7 @@ public class LitemallGrouponService {
*/
public List<LitemallGroupon> queryMyGroupon(Integer userId) {
LitemallGrouponExample example = new LitemallGrouponExample();
example.or().andUserIdEqualTo(userId).andCreatorUserIdEqualTo(userId).andGrouponIdEqualTo(0).andDeletedEqualTo(false).andPayedEqualTo(true);
example.or().andUserIdEqualTo(userId).andCreatorUserIdEqualTo(userId).andGrouponIdEqualTo(0).andStatusNotEqualTo(GrouponConstant.STATUS_NONE).andDeletedEqualTo(false);
example.orderBy("add_time desc");
return mapper.selectByExample(example);
}
......@@ -37,7 +38,7 @@ public class LitemallGrouponService {
*/
public List<LitemallGroupon> queryMyJoinGroupon(Integer userId) {
LitemallGrouponExample example = new LitemallGrouponExample();
example.or().andUserIdEqualTo(userId).andGrouponIdNotEqualTo(0).andDeletedEqualTo(false).andPayedEqualTo(true);
example.or().andUserIdEqualTo(userId).andGrouponIdNotEqualTo(0).andStatusNotEqualTo(GrouponConstant.STATUS_NONE).andDeletedEqualTo(false);
example.orderBy("add_time desc");
return mapper.selectByExample(example);
}
......@@ -62,7 +63,7 @@ public class LitemallGrouponService {
*/
public List<LitemallGroupon> queryJoinRecord(Integer id) {
LitemallGrouponExample example = new LitemallGrouponExample();
example.or().andGrouponIdEqualTo(id).andDeletedEqualTo(false).andPayedEqualTo(true);
example.or().andGrouponIdEqualTo(id).andStatusNotEqualTo(GrouponConstant.STATUS_NONE).andDeletedEqualTo(false);
example.orderBy("add_time desc");
return mapper.selectByExample(example);
}
......@@ -75,7 +76,7 @@ public class LitemallGrouponService {
*/
public LitemallGroupon queryById(Integer id) {
LitemallGrouponExample example = new LitemallGrouponExample();
example.or().andIdEqualTo(id).andDeletedEqualTo(false).andPayedEqualTo(true);
example.or().andIdEqualTo(id).andDeletedEqualTo(false);
return mapper.selectOneByExample(example);
}
......@@ -87,10 +88,16 @@ public class LitemallGrouponService {
*/
public int countGroupon(Integer grouponId) {
LitemallGrouponExample example = new LitemallGrouponExample();
example.or().andGrouponIdEqualTo(grouponId).andDeletedEqualTo(false).andPayedEqualTo(true);
example.or().andGrouponIdEqualTo(grouponId).andStatusNotEqualTo(GrouponConstant.STATUS_NONE).andDeletedEqualTo(false);
return (int) mapper.countByExample(example);
}
public boolean hasJoin(Integer userId, Integer grouponId) {
LitemallGrouponExample example = new LitemallGrouponExample();
example.or().andUserIdEqualTo(userId).andGrouponIdEqualTo(grouponId).andStatusNotEqualTo(GrouponConstant.STATUS_NONE).andDeletedEqualTo(false);
return mapper.countByExample(example) != 0;
}
public int updateById(LitemallGroupon groupon) {
groupon.setUpdateTime(LocalDateTime.now());
return mapper.updateByPrimaryKeySelective(groupon);
......@@ -127,10 +134,16 @@ public class LitemallGrouponService {
criteria.andRulesIdEqualTo(Integer.parseInt(rulesId));
}
criteria.andDeletedEqualTo(false);
criteria.andPayedEqualTo(true);
criteria.andStatusNotEqualTo(GrouponConstant.STATUS_NONE);
criteria.andGrouponIdEqualTo(0);
PageHelper.startPage(page, size);
return mapper.selectByExample(example);
}
public List<LitemallGroupon> queryByRuleId(int grouponRuleId) {
LitemallGrouponExample example = new LitemallGrouponExample();
example.or().andRulesIdEqualTo(grouponRuleId).andDeletedEqualTo(false);
return mapper.selectByExample(example);
}
}
......@@ -64,12 +64,12 @@ public class LitemallOrderService {
String now = df.format(LocalDate.now());
String orderSn = now + getRandomNum(6);
while (countByOrderSn(userId, orderSn) != 0) {
orderSn = getRandomNum(6);
orderSn = now + getRandomNum(6);
}
return orderSn;
}
public List<LitemallOrder> queryByOrderStatus(Integer userId, List<Short> orderStatus, Integer page, Integer limit) {
public List<LitemallOrder> queryByOrderStatus(Integer userId, List<Short> orderStatus, Integer page, Integer limit, String sort, String order) {
LitemallOrderExample example = new LitemallOrderExample();
example.setOrderByClause(LitemallOrder.Column.addTime.desc());
LitemallOrderExample.Criteria criteria = example.or();
......@@ -78,6 +78,10 @@ public class LitemallOrderService {
criteria.andOrderStatusIn(orderStatus);
}
criteria.andDeletedEqualTo(false);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, limit);
return litemallOrderMapper.selectByExample(example);
}
......@@ -122,10 +126,8 @@ public class LitemallOrderService {
}
public List<LitemallOrder> queryUnpaid(int minutes) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime expired = now.minusMinutes(minutes);
LitemallOrderExample example = new LitemallOrderExample();
example.or().andOrderStatusEqualTo(OrderUtil.STATUS_CREATE).andAddTimeLessThan(expired).andDeletedEqualTo(false);
example.or().andOrderStatusEqualTo(OrderUtil.STATUS_CREATE).andDeletedEqualTo(false);
return litemallOrderMapper.selectByExample(example);
}
......
......@@ -23,6 +23,7 @@ public class LitemallUserFormIdService {
LitemallUserFormidExample example = new LitemallUserFormidExample();
//符合找到该用户记录,且可用次数大于1,且还未过期
example.or().andOpenidEqualTo(openId).andExpireTimeGreaterThan(LocalDateTime.now());
example.setOrderByClause("add_time desc");
return formidMapper.selectOneByExample(example);
}
......
package org.linlinjava.litemall.db.util;
import org.linlinjava.litemall.db.domain.LitemallOrder;
public class GrouponConstant {
public static final Short RULE_STATUS_ON = 0;
public static final Short RULE_STATUS_DOWN_EXPIRE = 1;
public static final Short RULE_STATUS_DOWN_ADMIN = 2;
public static final Short STATUS_NONE = 0;
public static final Short STATUS_ON = 1;
public static final Short STATUS_SUCCEED = 2;
public static final Short STATUS_FAIL = 3;
}
......@@ -11,7 +11,7 @@ import java.util.List;
* 101 订单生成,未支付;102,下单未支付用户取消;103,下单未支付超期系统自动取消
* 201 支付完成,商家未发货;202,订单生产,已付款未发货,用户申请退款;203,管理员执行退款操作,确认退款成功;
* 301 商家发货,用户未确认;
* 401 用户确认收货,订单结束; 402 用户没有确认收货,但是快递反馈已收后,超过一定时间,系统自动确认收货,订单结束。
* 401 用户确认收货,订单结束; 402 用户没有确认收货,但是快递反馈已收后,超过一定时间,系统自动确认收货,订单结束。
*
* 当101用户未付款时,此时用户可以进行的操作是取消或者付款
* 当201支付完成而商家未发货时,此时用户可以退款
......@@ -27,9 +27,12 @@ public class OrderUtil {
public static final Short STATUS_CONFIRM = 401;
public static final Short STATUS_CANCEL = 102;
public static final Short STATUS_AUTO_CANCEL = 103;
public static final Short STATUS_ADMIN_CANCEL = 104;
public static final Short STATUS_REFUND = 202;
public static final Short STATUS_REFUND_CONFIRM = 203;
public static final Short STATUS_AUTO_CONFIRM = 402;
public static final Short STATUS_PAY_GROUPON = 200;
public static final Short STATUS_TIMEOUT_GROUPON = 204;
public static String orderStatusText(LitemallOrder order) {
......@@ -47,6 +50,10 @@ public class OrderUtil {
return "已取消(系统)";
}
if (status == 200) {
return "已付款团购";
}
if (status == 201) {
return "已付款";
}
......@@ -59,6 +66,10 @@ public class OrderUtil {
return "已退款";
}
if (status == 204) {
return "已超时团购";
}
if (status == 301) {
return "已发货";
}
......@@ -86,10 +97,10 @@ public class OrderUtil {
} else if (status == 102 || status == 103) {
// 如果订单已经取消或是已完成,则可删除
handleOption.setDelete(true);
} else if (status == 201) {
} else if (status == 200 || status == 201) {
// 如果订单已付款,没有发货,则可退款
handleOption.setRefund(true);
} else if (status == 202) {
} else if (status == 202 || status == 204) {
// 如果订单申请退款中,没有相关操作
} else if (status == 203) {
// 如果订单已经退款,则可删除
......@@ -144,6 +155,12 @@ public class OrderUtil {
return OrderUtil.STATUS_CREATE == litemallOrder.getOrderStatus().shortValue();
}
public static boolean hasPayed(LitemallOrder order) {
return OrderUtil.STATUS_CREATE != order.getOrderStatus().shortValue()
&& OrderUtil.STATUS_CANCEL != order.getOrderStatus().shortValue()
&& OrderUtil.STATUS_AUTO_CANCEL != order.getOrderStatus().shortValue();
}
public static boolean isPayStatus(LitemallOrder litemallOrder) {
return OrderUtil.STATUS_PAY == litemallOrder.getOrderStatus().shortValue();
}
......
......@@ -115,7 +115,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -124,12 +123,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, link, url, `position`, content, start_time, end_time, enabled, add_time,
update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_ad
......@@ -151,11 +149,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -178,18 +171,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, link, url, `position`, content, start_time, end_time, enabled, add_time,
update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_ad
......@@ -456,7 +447,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -473,18 +463,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, link, url, `position`, content, start_time, end_time, enabled, add_time,
update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_ad
......@@ -500,7 +488,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_ad set deleted = 1
<if test="_parameter != null">
......@@ -511,7 +498,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_ad set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
......@@ -117,7 +117,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -126,12 +125,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, user_id, province, city, county, address_detail, area_code, postal_code,
tel, is_default, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_address
......@@ -153,11 +151,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -180,18 +173,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, user_id, province, city, county, address_detail, area_code, postal_code,
tel, is_default, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_address
......@@ -488,7 +479,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -505,18 +495,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, user_id, province, city, county, address_detail, area_code, postal_code,
tel, is_default, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_address
......@@ -532,7 +520,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_address set deleted = 1
<if test="_parameter != null">
......@@ -543,7 +530,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_address set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
......@@ -151,7 +151,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -160,12 +159,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, username, `password`, last_login_ip, last_login_time, avatar, add_time, update_time,
deleted, role_ids
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_admin
......@@ -187,11 +185,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -214,18 +207,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, username, `password`, last_login_ip, last_login_time, avatar, add_time, update_time,
deleted, role_ids
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_admin
......@@ -464,7 +455,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -481,18 +471,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, username, `password`, last_login_ip, last_login_time, avatar, add_time, update_time,
deleted, role_ids
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_admin
......@@ -508,7 +496,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_admin set deleted = 1
<if test="_parameter != null">
......@@ -519,7 +506,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_admin set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
......@@ -111,7 +111,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -120,12 +119,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, `desc`, pic_url, sort_order, floor_price, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_brand
......@@ -147,11 +145,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -174,18 +167,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, `desc`, pic_url, sort_order, floor_price, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_brand
......@@ -408,7 +399,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -425,18 +415,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, `desc`, pic_url, sort_order, floor_price, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_brand
......@@ -452,7 +440,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_brand set deleted = 1
<if test="_parameter != null">
......@@ -463,7 +450,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_brand set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
......@@ -155,7 +155,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -164,12 +163,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, goods_id, goods_sn, goods_name, product_id, price, `number`, specifications,
`checked`, pic_url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_cart
......@@ -191,11 +189,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -218,18 +211,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, goods_id, goods_sn, goods_name, product_id, price, `number`, specifications,
`checked`, pic_url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_cart
......@@ -526,7 +517,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -543,18 +533,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, goods_id, goods_sn, goods_name, product_id, price, `number`, specifications,
`checked`, pic_url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_cart
......@@ -570,7 +558,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_cart set deleted = 1
<if test="_parameter != null">
......@@ -581,7 +568,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_cart set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
......@@ -115,7 +115,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -124,12 +123,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, keywords, `desc`, pid, icon_url, pic_url, `level`, sort_order, add_time,
update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_category
......@@ -151,11 +149,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -178,18 +171,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, keywords, `desc`, pid, icon_url, pic_url, `level`, sort_order, add_time,
update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_category
......@@ -456,7 +447,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -473,18 +463,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, keywords, `desc`, pid, icon_url, pic_url, `level`, sort_order, add_time,
update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_category
......@@ -500,7 +488,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_category set deleted = 1
<if test="_parameter != null">
......@@ -511,7 +498,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_category set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
......@@ -109,7 +109,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -118,11 +117,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, value_id, `type`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_collect
......@@ -144,11 +143,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -171,17 +165,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, value_id, `type`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_collect
......@@ -376,7 +369,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -393,17 +385,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, value_id, `type`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_collect
......@@ -419,7 +410,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_collect set deleted = 1
<if test="_parameter != null">
......@@ -430,7 +420,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_collect set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
......@@ -152,7 +152,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -161,12 +160,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, value_id, `type`, content, user_id, has_picture, pic_urls, star, add_time, update_time,
deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_comment
......@@ -188,11 +186,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -215,18 +208,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, value_id, `type`, content, user_id, has_picture, pic_urls, star, add_time, update_time,
deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_comment
......@@ -479,7 +470,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -496,18 +486,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, value_id, `type`, content, user_id, has_picture, pic_urls, star, add_time, update_time,
deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_comment
......@@ -523,7 +511,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_comment set deleted = 1
<if test="_parameter != null">
......@@ -534,7 +521,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_comment set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
......@@ -162,7 +162,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -171,13 +170,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, `desc`, tag, total, discount, `min`, `limit`, `type`, `status`, goods_type,
goods_value, code, time_type, `days`, start_time, end_time, add_time, update_time,
deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_coupon
......@@ -199,11 +196,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -226,19 +218,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, `desc`, tag, total, discount, `min`, `limit`, `type`, `status`, goods_type,
goods_value, code, time_type, `days`, start_time, end_time, add_time, update_time,
deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_coupon
......@@ -623,7 +612,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -640,19 +628,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, `desc`, tag, total, discount, `min`, `limit`, `type`, `status`, goods_type,
goods_value, code, time_type, `days`, start_time, end_time, add_time, update_time,
deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_coupon
......@@ -668,7 +653,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_coupon set deleted = 1
<if test="_parameter != null">
......@@ -679,7 +663,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_coupon set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment