diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java index 879da9a..be25987 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java @@ -11,8 +11,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; -import java.io.IOException; -import java.text.ParseException; import java.util.Map; @CrossOrigin(origins = "*") @@ -42,19 +40,6 @@ public class OrderController { // return orderService.createOrder(shopTable.getTableId(),shopTable.getShopId(),shopTable.getUserId()); } - /** - * 订单回显 - * @param orderId - * @return - */ -// @GetMapping ("/orderInfo") - private Result orderInfo(@RequestParam(required = false) Integer orderId){ - if (orderId==null) { - return Result.fail("请返回首页订单列表查看"); - } - return orderService.orderInfo(orderId); - } - /** * 订单详情 @@ -81,56 +66,4 @@ public class OrderController { } return orderService.rmOrder(Integer.valueOf(map.get("orderId").toString())); } - - @GetMapping("/tradeIntegral") - private Result tradeIntegral(@RequestParam("userId") String userId, @RequestParam("id") String id) throws IOException, ParseException { - return orderService.tradeIntegral(userId,id); - } -// @GetMapping("/我的积分") -// private Result mineYhq(@RequestParam("userId") String userId) throws IOException { -// return orderService.mineYhq(userId); -// } - @GetMapping("/mineCoupons") - private Result mineCoupons(@RequestHeader String token, - @RequestParam("userId") String userId, - @RequestParam("status") String status, - @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, - @RequestParam(value = "size", required = false, defaultValue = "1") Integer size, - @RequestParam("orderId") String orderId - ) throws IOException { - return orderService.mineCoupons(userId,orderId,status,page,size); - } - @GetMapping("/findCoupons") - private Result findCoupons(@RequestHeader String token,String type, - @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, - @RequestParam(value = "size", required = false, defaultValue = "1") Integer size) throws IOException { - return orderService.findCoupons(type,page,size); - } - - @GetMapping("/findWiningUser") - private Result findWiningUser(){ - return orderService.findWiningUser(); - } - @GetMapping("/mineWinner") - private Result mineWinner(@RequestHeader String token,@RequestParam Integer userId, - @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, - @RequestParam(value = "size", required = false, defaultValue = "1") Integer size){ - return orderService.mineWinner(userId,page,size); - } - @GetMapping("/getYhqPara") - private Result getYhqPara(){ - return orderService.getYhqPara(); - } - @GetMapping("/getYhqDouble") - private Result getYhqDouble(@RequestParam Integer orderId){ - return orderService.getYhqDouble(orderId); - } - @PostMapping("/yhqDouble") - private Result yhqDouble(@RequestParam Integer conponsId){ - return orderService.yhqDouble(conponsId); - } - @GetMapping("/kc") - private Result kc(){ - return orderService.kc(); - } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index 34e9417..e868891 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -136,7 +136,6 @@ public class PayController { @RequestMapping("getActive") public Result getActive( - @RequestHeader("token") String token, @RequestParam("shopId") String shopId, @RequestParam("page") int page, @RequestParam("pageSize") int pageSize) { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbShopCouponController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbShopCouponController.java new file mode 100644 index 0000000..7e0047e --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbShopCouponController.java @@ -0,0 +1,37 @@ +package com.chaozhanggui.system.cashierservice.controller; + +import com.chaozhanggui.system.cashierservice.entity.dto.CouponDto; +import com.chaozhanggui.system.cashierservice.service.TbShopCouponService; +import com.chaozhanggui.system.cashierservice.sign.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 优惠券(TbShopCoupon)表控制层 + * + * @author ww + * @since 2024-10-23 15:37:26 + */ +@RestController +@RequestMapping("coupon") +public class TbShopCouponController { + /** + * 服务对象 + */ + @Autowired + private TbShopCouponService tbShopCouponService; + + /** + * 根据优惠券DTO查询优惠券 + * @param param 优惠券DTO + * @return 查询结果 + */ + @RequestMapping("find") + public Result find(@RequestBody CouponDto param) { + return tbShopCouponService.find(param); + } + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbUserCouponsController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbUserCouponsController.java deleted file mode 100644 index 508867a..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbUserCouponsController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.chaozhanggui.system.cashierservice.controller; - -import com.chaozhanggui.system.cashierservice.entity.dto.UserCouponDto; -import com.chaozhanggui.system.cashierservice.service.TbUserCouponsService; -import com.chaozhanggui.system.cashierservice.sign.Result; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - - -@RestController -@RequestMapping("userConpons") -public class TbUserCouponsController { - /** - * 服务对象 - */ - @Autowired - private TbUserCouponsService tbUserCouponsService; - - /** - * 查询优惠卷 - * @param conponDto - * @return - */ - @RequestMapping("find") - public Result queryByPage(@RequestBody UserCouponDto conponDto) { - return tbUserCouponsService.queryByPage(conponDto); - } - -} - diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java index 319da29..2c6c0e7 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java @@ -3,26 +3,21 @@ package com.chaozhanggui.system.cashierservice.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; -import com.alibaba.fastjson.JSONObject; import com.chaozhanggui.system.cashierservice.dao.TbShopInfoMapper; import com.chaozhanggui.system.cashierservice.dao.TbShopUserMapper; import com.chaozhanggui.system.cashierservice.dao.TbUserInfoMapper; import com.chaozhanggui.system.cashierservice.entity.TbShopInfo; import com.chaozhanggui.system.cashierservice.entity.TbShopUser; import com.chaozhanggui.system.cashierservice.entity.TbUserInfo; -import com.chaozhanggui.system.cashierservice.entity.vo.IntegralFlowVo; -import com.chaozhanggui.system.cashierservice.entity.vo.IntegralVo; import com.chaozhanggui.system.cashierservice.entity.vo.OpenMemberVo; import com.chaozhanggui.system.cashierservice.service.UserService; import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; -import com.chaozhanggui.system.cashierservice.util.TokenUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.io.IOException; import java.math.BigDecimal; @CrossOrigin(origins = "*") @@ -42,27 +37,6 @@ public class UserContoller { @Autowired private TbUserInfoMapper userInfoMapper; -// @GetMapping("/userInfo") -// public JSONObject userInfo(@RequestParam("openId") String openId ) throws Exception { -// TbUserInfo shopUser = userInfoMapper.selectByOpenId(openId); -// JSONObject jsonObject = new JSONObject(); -// if (Objects.isNull(shopUser)){ -// jsonObject.put("status","fail"); -// jsonObject.put("msg","用户不存在"); -// return jsonObject; -// } -// String userSign = UUID.randomUUID().toString().replaceAll("-",""); -// String token = TokenUtil.generateJfToken(openId,userSign); -// JSONObject object = new JSONObject(); -// object.put("token",token); -// object.put("userSign",userSign); -// object.put("num",shopUser.getTotalScore()); -// jsonObject.put("status","success"); -// jsonObject.put("msg","成功"); -// jsonObject.put("data",object); -// return jsonObject; -// } - @PostMapping("/openMember") public Result openMember(@RequestBody OpenMemberVo memberVo){ if(StringUtils.isBlank(memberVo.getTelephone())){ @@ -138,41 +112,6 @@ public class UserContoller { return Result.success(CodeEnum.SUCCESS, shopUser); } - @GetMapping("/userCoupon") - public Result userCoupon(@RequestParam("userId") String userId, @RequestParam("orderNum") BigDecimal orderNum) throws Exception { - int num = userService.userCoupon(userId, orderNum); - return Result.success(CodeEnum.SUCCESS, num); - } - - @PostMapping("/modityIntegral") - public JSONObject modityIntegral(@RequestHeader String token, @RequestBody IntegralVo integralVo) throws Exception { - JSONObject jsonObject = TokenUtil.parseParamFromToken(token); - String userSign = jsonObject.getString("userSign"); - return userService.modityIntegral(integralVo, userSign); - } - - @PostMapping("/userIntegral") - public JSONObject userIntegral(@RequestHeader String token, @RequestBody IntegralFlowVo integralFlowVo) throws Exception { - JSONObject jsonObject = TokenUtil.parseParamFromToken(token); - String userSign = jsonObject.getString("userSign"); - return userService.userIntegral(integralFlowVo, userSign); - } - - @PostMapping("/userAllIntegral") - public JSONObject userAllIntegral(@RequestBody IntegralFlowVo integralFlowVo) throws Exception { -// JSONObject jsonObject = TokenUtil.parseParamFromToken(token); -// String userSign = jsonObject.getString("userSign"); - return userService.userAllIntegral(integralFlowVo, "userSign"); - } - - @PostMapping("/userAll") - public JSONObject userAll(@RequestBody IntegralFlowVo integralFlowVo) throws Exception { -// JSONObject jsonObject = TokenUtil.parseParamFromToken(token); -// String userSign = jsonObject.getString("userSign"); - return userService.userAll(integralFlowVo, "userSign"); - } - - /** * 获取订阅当前用户店库存预警消息的二维码 * diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java index dfbf581..2b1b96a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java @@ -1,9 +1,7 @@ package com.chaozhanggui.system.cashierservice.dao; import com.chaozhanggui.system.cashierservice.entity.TbActivateInRecord; -import com.chaozhanggui.system.cashierservice.entity.TbProduct; -import com.chaozhanggui.system.cashierservice.entity.TbUserCoupons; -import com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo; +import com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -32,10 +30,11 @@ public interface TbActivateInRecordMapper { */ List queryAll(TbActivateInRecord tbActivateInRecord); - List queryByVipIdAndShopId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId); - List queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("shopName")String shopName); - int queryByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId); - List queryAllByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId); + //未使用券 + List queryByVipIdAndShopId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId); + List queryByVipIdAndShopIdIn(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId); + //过期券 + List queryByVipIdAndShopIdExpire(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId); int countCouponNum(@Param("userId") Integer userId); @@ -64,8 +63,6 @@ public interface TbActivateInRecordMapper { */ int update(TbActivateInRecord tbActivateInRecord); - int updateOverNumById(@Param("id")Integer id,@Param("overNum")Integer overNum); - /** * 通过主键删除数据 * diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java index 34b3888..bd125a3 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java @@ -1,29 +1,72 @@ package com.chaozhanggui.system.cashierservice.dao; import com.chaozhanggui.system.cashierservice.entity.TbActivate; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; +import org.springframework.data.domain.Pageable; import java.math.BigDecimal; import java.util.List; -@Component -@Mapper +/** + * (TbActivate)表数据库访问层 + * + * @author ww + * @since 2024-10-23 14:19:53 + */ public interface TbActivateMapper { -// int deleteByPrimaryKey(Integer id); -// int insert(TbActivate record); + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbActivate queryById(Integer id); -// int insertSelective(TbActivate record); + /** + * 查询数据 + * + * @param tbActivate 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAll(TbActivate tbActivate, @Param("pageable") Pageable pageable); - TbActivate selectByPrimaryKey(Integer id); - -// int updateByPrimaryKeySelective(TbActivate record); - -// int updateByPrimaryKey(TbActivate record); + List selectByShopId(String shopId); TbActivate selectByAmount(@Param("shopId") String shopId,@Param("amount") BigDecimal amount); - List selectByShopId(String shopId); + + /** + * 新增数据 + * + * @param tbActivate 实例对象 + * @return 影响行数 + */ + int insert(TbActivate tbActivate); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param tbActivate 实例对象 + * @return 影响行数 + */ + int update(TbActivate tbActivate); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java index 7b8b5ba..9bd655d 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java @@ -1,8 +1,9 @@ package com.chaozhanggui.system.cashierservice.dao; import com.chaozhanggui.system.cashierservice.entity.TbActivateOutRecord; -import com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo; +import com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo; import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * 活动赠送商品使用记录表(TbActivateOutRecord)表数据库访问层 * * @author ww - * @since 2024-08-22 11:21:56 + * @since 2024-10-23 14:55:22 */ public interface TbActivateOutRecordMapper { @@ -26,12 +27,12 @@ public interface TbActivateOutRecordMapper { * 查询数据 * * @param tbActivateOutRecord 查询条件 + * @param pageable 分页对象 * @return 对象列表 */ - List queryAll(TbActivateOutRecord tbActivateOutRecord); - - List queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId, @Param("shopName") String shopName); + List queryAll(TbActivateOutRecord tbActivateOutRecord, @Param("pageable") Pageable pageable); + List queryByVipIdAndShopId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId); /** * 新增数据 @@ -57,14 +58,6 @@ public interface TbActivateOutRecordMapper { */ int update(TbActivateOutRecord tbActivateOutRecord); - /** - * 根据订单id 将数据状态变为 - * @param orderId 订单Id - * @param status 状态 - * @return - */ - int updateByOrderIdAndStatus(@Param("orderId")Integer orderId,@Param("status")String status); - /** * 通过主键删除数据 * diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateProductMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateProductMapper.java deleted file mode 100644 index 6240a16..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateProductMapper.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbActivateProduct; -import org.apache.ibatis.annotations.Param; -import java.util.List; - -/** - * 活动赠送商品表(TbActivateProduct)表数据库访问层 - * - * @author ww - * @since 2024-08-20 15:14:55 - */ -public interface TbActivateProductMapper { - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - TbActivateProduct queryById(Integer id); - - /** - * 查询数据 - * - * @param tbActivateProduct 查询条件 - * @return 对象列表 - */ - List queryAll(TbActivateProduct tbActivateProduct); - - List queryAllByActivateId(Integer activateId); - List queryProsByActivateId(Integer activateId); - - - /** - * 新增数据 - * - * @param tbActivateProduct 实例对象 - * @return 影响行数 - */ - int insert(TbActivateProduct tbActivateProduct); - - /** - * 批量新增数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - */ - int insertBatch(@Param("entities") List entities); - - /** - * 修改数据 - * - * @param tbActivateProduct 实例对象 - * @return 影响行数 - */ - int update(TbActivateProduct tbActivateProduct); - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 影响行数 - */ - int deleteById(Integer id); - -} - diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCouponProductMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCouponProductMapper.java new file mode 100644 index 0000000..6ca6628 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCouponProductMapper.java @@ -0,0 +1,72 @@ +package com.chaozhanggui.system.cashierservice.dao; + +import com.chaozhanggui.system.cashierservice.entity.TbCouponProduct; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +/** + * 活动赠送商品表(TbCouponProduct)表数据库访问层 + * + * @author ww + * @since 2024-10-23 14:35:49 + */ +public interface TbCouponProductMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbCouponProduct queryById(Integer id); + + /** + * 查询数据 + * + * @param tbCouponProduct 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAll(TbCouponProduct tbCouponProduct, @Param("pageable") Pageable pageable); + + + List queryAllByCouponId(Integer couponId); + List queryProsByActivateId(@Param("couponId")Integer couponId,@Param("num")Integer num); + + + /** + * 新增数据 + * + * @param tbCouponProduct 实例对象 + * @return 影响行数 + */ + int insert(TbCouponProduct tbCouponProduct); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param tbCouponProduct 实例对象 + * @return 影响行数 + */ + int update(TbCouponProduct tbCouponProduct); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceOperateInfoMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceOperateInfoMapper.java deleted file mode 100644 index 38b0c4d..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceOperateInfoMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbDeviceOperateInfo; - -public interface TbDeviceOperateInfoMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbDeviceOperateInfo record); - - int insertSelective(TbDeviceOperateInfo record); - - TbDeviceOperateInfo selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbDeviceOperateInfo record); - - int updateByPrimaryKey(TbDeviceOperateInfo record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceStockMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceStockMapper.java deleted file mode 100644 index 88b0e55..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceStockMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbDeviceStock; - -public interface TbDeviceStockMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbDeviceStock record); - - int insertSelective(TbDeviceStock record); - - TbDeviceStock selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbDeviceStock record); - - int updateByPrimaryKey(TbDeviceStock record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbIntegralFlowMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbIntegralFlowMapper.java deleted file mode 100644 index cb6f56f..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbIntegralFlowMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbIntegralFlow; - -public interface TbIntegralFlowMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbIntegralFlow record); - - int insertSelective(TbIntegralFlow record); - - TbIntegralFlow selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbIntegralFlow record); - - int updateByPrimaryKey(TbIntegralFlow record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbIntegralMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbIntegralMapper.java deleted file mode 100644 index 322cfcd..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbIntegralMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbIntegral; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -public interface TbIntegralMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbIntegral record); - - int insertSelective(TbIntegral record); - - TbIntegral selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbIntegral record); - - int updateByPrimaryKey(TbIntegral record); - - List selectAllByUserId(String userId); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbMerchantCouponMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbMerchantCouponMapper.java deleted file mode 100644 index 08bf7d4..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbMerchantCouponMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbMerchantCoupon; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Component; - -/** - * 优惠券(TbMerchantCoupon)表数据库访问层 - * - * @author lyf - * @since 2024-04-02 09:24:16 - */ -@Component -@Mapper -public interface TbMerchantCouponMapper { - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - TbMerchantCoupon queryById(Integer id); - - - -} - diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbParamsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbParamsMapper.java deleted file mode 100644 index f234c90..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbParamsMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbParams; - -public interface TbParamsMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbParams record); - - int insertSelective(TbParams record); - - TbParams selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbParams record); - - int updateByPrimaryKey(TbParams record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussDeviceGoodsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussDeviceGoodsMapper.java deleted file mode 100644 index c97cc2d..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussDeviceGoodsMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbPlussDeviceGoods; - -public interface TbPlussDeviceGoodsMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbPlussDeviceGoods record); - - int insertSelective(TbPlussDeviceGoods record); - - TbPlussDeviceGoods selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbPlussDeviceGoods record); - - int updateByPrimaryKeyWithBLOBs(TbPlussDeviceGoods record); - - int updateByPrimaryKey(TbPlussDeviceGoods record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReceiptSalesMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReceiptSalesMapper.java deleted file mode 100644 index 51af334..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReceiptSalesMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbReceiptSales; - -public interface TbReceiptSalesMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbReceiptSales record); - - int insertSelective(TbReceiptSales record); - - TbReceiptSales selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbReceiptSales record); - - int updateByPrimaryKey(TbReceiptSales record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReleaseFlowMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReleaseFlowMapper.java deleted file mode 100644 index 0cce4bd..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReleaseFlowMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbReleaseFlow; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TbReleaseFlowMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbReleaseFlow record); - - int insertSelective(TbReleaseFlow record); - - TbReleaseFlow selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbReleaseFlow record); - - int updateByPrimaryKey(TbReleaseFlow record); - - List selectByUserId(@Param("userId") String userId); - - List selectAll(); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbRenewalsPayLogMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbRenewalsPayLogMapper.java deleted file mode 100644 index 0f317e8..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbRenewalsPayLogMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbRenewalsPayLog; - -public interface TbRenewalsPayLogMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbRenewalsPayLog record); - - int insertSelective(TbRenewalsPayLog record); - - TbRenewalsPayLog selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbRenewalsPayLog record); - - int updateByPrimaryKey(TbRenewalsPayLog record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCashSpreadMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCashSpreadMapper.java deleted file mode 100644 index ddcc1bd..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCashSpreadMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbShopCashSpread; -import com.chaozhanggui.system.cashierservice.entity.TbShopCashSpreadWithBLOBs; - -public interface TbShopCashSpreadMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbShopCashSpreadWithBLOBs record); - - int insertSelective(TbShopCashSpreadWithBLOBs record); - - TbShopCashSpreadWithBLOBs selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbShopCashSpreadWithBLOBs record); - - int updateByPrimaryKeyWithBLOBs(TbShopCashSpreadWithBLOBs record); - - int updateByPrimaryKey(TbShopCashSpread record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCouponMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCouponMapper.java new file mode 100644 index 0000000..0ce36a0 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCouponMapper.java @@ -0,0 +1,68 @@ +package com.chaozhanggui.system.cashierservice.dao; + +import com.chaozhanggui.system.cashierservice.entity.TbShopCoupon; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +/** + * 优惠券(TbShopCoupon)表数据库访问层 + * + * @author ww + * @since 2024-10-23 14:25:13 + */ +public interface TbShopCouponMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbShopCoupon queryById(Integer id); + + /** + * 查询数据 + * + * @param tbShopCoupon 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAll(TbShopCoupon tbShopCoupon, @Param("pageable") Pageable pageable); + + + /** + * 新增数据 + * + * @param tbShopCoupon 实例对象 + * @return 影响行数 + */ + int insert(TbShopCoupon tbShopCoupon); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param tbShopCoupon 实例对象 + * @return 影响行数 + */ + int update(TbShopCoupon tbShopCoupon); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCurrencyMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCurrencyMapper.java deleted file mode 100644 index 8dbcb5b..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCurrencyMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbShopCurrency; -import com.chaozhanggui.system.cashierservice.entity.TbShopCurrencyWithBLOBs; - -public interface TbShopCurrencyMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbShopCurrencyWithBLOBs record); - - int insertSelective(TbShopCurrencyWithBLOBs record); - - TbShopCurrencyWithBLOBs selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbShopCurrencyWithBLOBs record); - - int updateByPrimaryKeyWithBLOBs(TbShopCurrencyWithBLOBs record); - - int updateByPrimaryKey(TbShopCurrency record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java index ad6904e..a22953d 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java @@ -13,11 +13,6 @@ import java.util.List; @Component @Mapper public interface TbShopInfoMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbShopInfo record); - - int insertSelective(TbShopInfo record); List selShopInfoByGps(@Param("rightTopLng") Double rightTopLng, @Param("rightTopLat") Double rightTopLat, @Param("leftBottomLng") Double leftBottomLng, @Param("leftBottomLat") Double leftBottomLat, @@ -30,12 +25,6 @@ public interface TbShopInfoMapper { List selectByIds(@Param("list") List ids); - int updateByPrimaryKeySelective(TbShopInfo record); - - int updateByPrimaryKeyWithBLOBs(TbShopInfo record); - - int updateByPrimaryKey(TbShopInfo record); - TbShopInfo selectByQrCode(String qrcode); TbShopInfo selectByPhone(String phone); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java index 78baab9..6df8e88 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java @@ -1,6 +1,5 @@ package com.chaozhanggui.system.cashierservice.dao; -import com.chaozhanggui.system.cashierservice.entity.TbParams; import com.chaozhanggui.system.cashierservice.entity.TbShopUser; import com.chaozhanggui.system.cashierservice.entity.vo.ShopUserListVo; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +8,6 @@ import org.springframework.stereotype.Component; import java.math.BigDecimal; import java.util.List; -import java.util.Map; @Component @Mapper @@ -40,6 +38,4 @@ public interface TbShopUserMapper { List selectByUserId(@Param("userId") String userId, @Param("shopId") String shopId); TbShopUser selectByOpenId(@Param("openId") String openId); - - TbParams selectParams(); } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSplitAccountsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSplitAccountsMapper.java deleted file mode 100644 index 70ee67a..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSplitAccountsMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbSplitAccounts; - -public interface TbSplitAccountsMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbSplitAccounts record); - - int insertSelective(TbSplitAccounts record); - - TbSplitAccounts selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbSplitAccounts record); - - int updateByPrimaryKey(TbSplitAccounts record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSystemCouponsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSystemCouponsMapper.java deleted file mode 100644 index c66ed50..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbSystemCouponsMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbSystemCoupons; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; -import java.util.List; - -public interface TbSystemCouponsMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbSystemCoupons record); - - int insertSelective(TbSystemCoupons record); - - TbSystemCoupons selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbSystemCoupons record); - - int updateByPrimaryKey(TbSystemCoupons record); - - List selectAll(@Param("type") String type); - - int selectByAmount(@Param("orderNum") BigDecimal orderNum); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java deleted file mode 100644 index 8306b65..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbUserCoupons; -import com.chaozhanggui.system.cashierservice.entity.dto.UserCouponDto; -import com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; - -import java.math.BigDecimal; -import java.util.List; - -@Component -@Mapper -public interface TbUserCouponsMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbUserCoupons record); - - int insertSelective(TbUserCoupons record); - - TbUserCoupons selectByPrimaryKey(Integer id); - List queryAllSelective(UserCouponDto record); - - int updateByPrimaryKeySelective(TbUserCoupons record); - - int updateByPrimaryKey(TbUserCoupons record); - - List selectByUserId(@Param("userId") String userId,@Param("status") String status,@Param("amount") BigDecimal amount); - - TbUserCoupons selectByOrderId(@Param("orderId") Integer orderId); - - int selectByUserIdAndAmount(@Param("userId") String userId, @Param("orderNum") BigDecimal orderNum); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbWiningParamsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbWiningParamsMapper.java deleted file mode 100644 index 803fc9f..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbWiningParamsMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbWiningParams; - -import java.util.List; - -public interface TbWiningParamsMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbWiningParams record); - - int insertSelective(TbWiningParams record); - - TbWiningParams selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbWiningParams record); - - int updateByPrimaryKey(TbWiningParams record); - - List selectAll(); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbWiningUserMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbWiningUserMapper.java deleted file mode 100644 index 8659d34..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbWiningUserMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbWiningUser; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -@Mapper -public interface TbWiningUserMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbWiningUser record); - - int insertSelective(TbWiningUser record); - - TbWiningUser selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbWiningUser record); - - int updateByPrimaryKey(TbWiningUser record); - - List selectAllByTrade(@Param("day") String day); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbYhqParamsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbYhqParamsMapper.java deleted file mode 100644 index 0693c83..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbYhqParamsMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbYhqParams; - -import java.util.List; - -public interface TbYhqParamsMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbYhqParams record); - - int insertSelective(TbYhqParams record); - - TbYhqParams selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbYhqParams record); - - int updateByPrimaryKey(TbYhqParams record); - - List selectAll(); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/ViewOrderMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/ViewOrderMapper.java deleted file mode 100644 index 44a16c9..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/ViewOrderMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.ViewOrder; - -public interface ViewOrderMapper { - int insert(ViewOrder record); - - int insertSelective(ViewOrder record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java index a2d5246..35d9c79 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java @@ -1,33 +1,49 @@ package com.chaozhanggui.system.cashierservice.entity; -import org.springframework.util.CollectionUtils; - +import java.util.Date; import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.List; +/** + * (TbActivate)实体类 + * + * @author ww + * @since 2024-10-23 14:16:33 + */ public class TbActivate implements Serializable { + private static final long serialVersionUID = 216340931948517603L; + private Integer id; private Integer shopId; + /** + * 充值金额 + */ + private Integer amount; + /** + * 赠送金额 + */ + private Integer giftAmount; + /** + * 是否使用优惠卷 0否 1是 + */ + private Integer isUseCoupon; + /** + * 优惠卷id + */ + private Integer couponId; + /** + * 优惠卷数量 + */ + private Integer num; - private Integer minNum; + private Date createTime = new Date(); - private Integer maxNum; + private Date updateTime = new Date(); - private BigDecimal handselNum; - - private String handselType; - - private String isDel; - - //是否赠送商品 0否 1是 - private Integer isGiftPro; + private String couponDesc; private List gives; - private static final long serialVersionUID = 1L; - public Integer getId() { return id; } @@ -44,52 +60,69 @@ public class TbActivate implements Serializable { this.shopId = shopId; } - public Integer getMinNum() { - return minNum; + public Integer getAmount() { + return amount; } - public void setMinNum(Integer minNum) { - this.minNum = minNum; + public void setAmount(Integer amount) { + this.amount = amount; } - public Integer getMaxNum() { - return maxNum; + public Integer getGiftAmount() { + return giftAmount; } - public void setMaxNum(Integer maxNum) { - this.maxNum = maxNum; + public void setGiftAmount(Integer giftAmount) { + this.giftAmount = giftAmount; } - public BigDecimal getHandselNum() { - return handselNum; + public Integer getIsUseCoupon() { + return isUseCoupon; } - public void setHandselNum(BigDecimal handselNum) { - this.handselNum = handselNum; + public void setIsUseCoupon(Integer isUseCoupon) { + this.isUseCoupon = isUseCoupon; } - public String getHandselType() { - return handselType; + public Integer getCouponId() { + return couponId; } - public void setHandselType(String handselType) { - this.handselType = handselType == null ? null : handselType.trim(); + public void setCouponId(Integer couponId) { + this.couponId = couponId; } - public String getIsDel() { - return isDel; + public Integer getNum() { + return num; } - public void setIsDel(String isDel) { - this.isDel = isDel == null ? null : isDel.trim(); + public void setNum(Integer num) { + this.num = num; } - public Integer getIsGiftPro() { - return isGiftPro; + public Date getCreateTime() { + return createTime; } - public void setIsGiftPro(Integer isGiftPro) { - this.isGiftPro = isGiftPro; + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + + public String getCouponDesc() { + return couponDesc; + } + + public void setCouponDesc(String couponDesc) { + this.couponDesc = couponDesc; } public List getGives() { @@ -97,10 +130,7 @@ public class TbActivate implements Serializable { } public void setGives(List gives) { - if(CollectionUtils.isEmpty(gives)){ - this.gives = new ArrayList<>(); - }else { - this.gives = gives; - } + this.gives = gives; } -} \ No newline at end of file +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java index afc81af..e7385df 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java @@ -4,56 +4,75 @@ import java.util.Date; import java.io.Serializable; /** - * 活动商品赠送表(TbActivateInRecord)实体类 + * 活动商品赠送记录表(TbActivateInRecord)实体类 * * @author ww - * @since 2024-08-22 11:13:40 + * @since 2024-10-23 16:43:02 */ public class TbActivateInRecord implements Serializable { - private static final long serialVersionUID = -35515830201618782L; + private static final long serialVersionUID = -31673077202067433L; private Integer id; - /** +/** * 会员id */ private Integer vipUserId; - /** +/** + * 卷Id (校验是否可用) + */ + private Integer couponId; +/** + * 卷描述 满10减2/商品卷 + */ + private String name; +/** + * 1-满减 2-商品 + */ + private Integer type; +/** * 商品id */ private Integer proId; - /** +/** + * 满多少金额 + */ + private Integer fullAmount; +/** + * 减多少金额 + */ + private Integer discountAmount; +/** * 赠送数量 */ private Integer num; - /** +/** * 未使用数量 */ private Integer overNum; - /** +/** * 店铺id */ private Integer shopId; - /** +/** * 来源活动id */ private Integer sourceActId; private Integer sourceFlowId; +/** + * 可用开始时间 + */ + private Date useStartTime; +/** + * 可用结束时间 + */ + private Date useEndTime; private Date createTime; private Date updateTime; - public TbActivateInRecord(Integer vipUserId, Integer proId, Integer num, Integer shopId, Integer sourceActId,Integer sourceFlowId) { - this.vipUserId = vipUserId; - this.proId = proId; - this.num = num; - this.overNum = num; - this.shopId = shopId; - this.sourceActId = sourceActId; - this.sourceFlowId = sourceFlowId; - this.createTime=new Date(); - } + private String couponJson; public Integer getId() { @@ -72,6 +91,30 @@ public class TbActivateInRecord implements Serializable { this.vipUserId = vipUserId; } + public Integer getCouponId() { + return couponId; + } + + public void setCouponId(Integer couponId) { + this.couponId = couponId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public Integer getProId() { return proId; } @@ -80,6 +123,22 @@ public class TbActivateInRecord implements Serializable { this.proId = proId; } + public Integer getFullAmount() { + return fullAmount; + } + + public void setFullAmount(Integer fullAmount) { + this.fullAmount = fullAmount; + } + + public Integer getDiscountAmount() { + return discountAmount; + } + + public void setDiscountAmount(Integer discountAmount) { + this.discountAmount = discountAmount; + } + public Integer getNum() { return num; } @@ -120,6 +179,22 @@ public class TbActivateInRecord implements Serializable { this.sourceFlowId = sourceFlowId; } + public Date getUseStartTime() { + return useStartTime; + } + + public void setUseStartTime(Date useStartTime) { + this.useStartTime = useStartTime; + } + + public Date getUseEndTime() { + return useEndTime; + } + + public void setUseEndTime(Date useEndTime) { + this.useEndTime = useEndTime; + } + public Date getCreateTime() { return createTime; } @@ -136,5 +211,13 @@ public class TbActivateInRecord implements Serializable { this.updateTime = updateTime; } + public String getCouponJson() { + return couponJson; + } + + public void setCouponJson(String couponJson) { + this.couponJson = couponJson; + } + } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java index dd5d295..d1afc74 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java @@ -7,20 +7,30 @@ import java.io.Serializable; * 活动赠送商品使用记录表(TbActivateOutRecord)实体类 * * @author ww - * @since 2024-08-22 11:21:56 + * @since 2024-10-23 14:55:22 */ public class TbActivateOutRecord implements Serializable { - private static final long serialVersionUID = -54399746948905097L; + private static final long serialVersionUID = -34082928893064380L; private Integer id; + + private Integer shopId; /** - * 商品赠送Id + * 订单id + */ + private String orderId; + /** + * 商品赠送Id tb_activate_in_record的id */ private Integer giveId; /** - * 商品id + * 会员id */ - private Integer proId; + private Integer vipUserId; + /** + * 1-满减 2-商品 + */ + private Integer type; /** * 使用数量 */ @@ -30,24 +40,14 @@ public class TbActivateOutRecord implements Serializable { */ private Integer refNum; /** - * 订单id + * 新建： create， 完成： closed, 取消：cancel, */ - private String orderId; - //新建： create， 完成： closed, 取消：cancel, private String status; private Date createTime; private Date updateTime; - public TbActivateOutRecord(Integer giveId, Integer proId, Integer useNum, String orderId, String status) { - this.giveId = giveId; - this.proId = proId; - this.useNum = useNum; - this.orderId = orderId; - this.status = status; - this.createTime = new Date(); - } public Integer getId() { return id; @@ -57,6 +57,22 @@ public class TbActivateOutRecord implements Serializable { this.id = id; } + public Integer getShopId() { + return shopId; + } + + public void setShopId(Integer shopId) { + this.shopId = shopId; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + public Integer getGiveId() { return giveId; } @@ -65,12 +81,20 @@ public class TbActivateOutRecord implements Serializable { this.giveId = giveId; } - public Integer getProId() { - return proId; + public Integer getVipUserId() { + return vipUserId; } - public void setProId(Integer proId) { - this.proId = proId; + public void setVipUserId(Integer vipUserId) { + this.vipUserId = vipUserId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; } public Integer getUseNum() { @@ -97,14 +121,6 @@ public class TbActivateOutRecord implements Serializable { this.status = status; } - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId; - } - public Date getCreateTime() { return createTime; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateProduct.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCouponProduct.java similarity index 72% rename from src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateProduct.java rename to src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCouponProduct.java index d8383dd..2572106 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateProduct.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCouponProduct.java @@ -4,24 +4,24 @@ import java.util.Date; import java.io.Serializable; /** - * 活动赠送商品表(TbActivateProduct)实体类 + * 活动赠送商品表(TbCouponProduct)实体类 * * @author ww - * @since 2024-08-20 15:15:01 + * @since 2024-10-23 14:35:49 */ -public class TbActivateProduct implements Serializable { - private static final long serialVersionUID = 592370528166603965L; +public class TbCouponProduct implements Serializable { + private static final long serialVersionUID = 619724621133545616L; private Integer id; -/** + /** * 活动Id */ - private Integer activateId; -/** + private Integer couponId; + /** * 商品id */ private Integer productId; -/** + /** * 数量 */ private Integer num; @@ -39,12 +39,12 @@ public class TbActivateProduct implements Serializable { this.id = id; } - public Integer getActivateId() { - return activateId; + public Integer getCouponId() { + return couponId; } - public void setActivateId(Integer activateId) { - this.activateId = activateId; + public void setCouponId(Integer couponId) { + this.couponId = couponId; } public Integer getProductId() { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceOperateInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceOperateInfo.java deleted file mode 100644 index e6c8e56..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceOperateInfo.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.util.Date; - -public class TbDeviceOperateInfo implements Serializable { - private Integer id; - - private String deviceno; - - private String type; - - private String shopId; - - private Date createtime; - - private String remark; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getDeviceno() { - return deviceno; - } - - public void setDeviceno(String deviceno) { - this.deviceno = deviceno == null ? null : deviceno.trim(); - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type == null ? null : type.trim(); - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId == null ? null : shopId.trim(); - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceStock.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceStock.java deleted file mode 100644 index 0c6fc38..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceStock.java +++ /dev/null @@ -1,249 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -public class TbDeviceStock implements Serializable { - private Integer id; - - private String code; - - private String snno; - - private String orderno; - - private BigDecimal price; - - private String type; - - private String groupno; - - private String buymercname; - - private String buymercid; - - private String actmercname; - - private String actmercid; - - private String status; - - private Date createtime; - - private String createby; - - private String delflag; - - private String remarks; - - private Date updatetime; - - private String deviceno; - - private Integer belonguserid; - - private Integer extractuserid; - - private String rolecode; - - private Date instocktime; - - private String transferstatus; - - private Date bindtime; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code == null ? null : code.trim(); - } - - public String getSnno() { - return snno; - } - - public void setSnno(String snno) { - this.snno = snno == null ? null : snno.trim(); - } - - public String getOrderno() { - return orderno; - } - - public void setOrderno(String orderno) { - this.orderno = orderno == null ? null : orderno.trim(); - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type == null ? null : type.trim(); - } - - public String getGroupno() { - return groupno; - } - - public void setGroupno(String groupno) { - this.groupno = groupno == null ? null : groupno.trim(); - } - - public String getBuymercname() { - return buymercname; - } - - public void setBuymercname(String buymercname) { - this.buymercname = buymercname == null ? null : buymercname.trim(); - } - - public String getBuymercid() { - return buymercid; - } - - public void setBuymercid(String buymercid) { - this.buymercid = buymercid == null ? null : buymercid.trim(); - } - - public String getActmercname() { - return actmercname; - } - - public void setActmercname(String actmercname) { - this.actmercname = actmercname == null ? null : actmercname.trim(); - } - - public String getActmercid() { - return actmercid; - } - - public void setActmercid(String actmercid) { - this.actmercid = actmercid == null ? null : actmercid.trim(); - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status == null ? null : status.trim(); - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - public String getCreateby() { - return createby; - } - - public void setCreateby(String createby) { - this.createby = createby == null ? null : createby.trim(); - } - - public String getDelflag() { - return delflag; - } - - public void setDelflag(String delflag) { - this.delflag = delflag == null ? null : delflag.trim(); - } - - public String getRemarks() { - return remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks == null ? null : remarks.trim(); - } - - public Date getUpdatetime() { - return updatetime; - } - - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; - } - - public String getDeviceno() { - return deviceno; - } - - public void setDeviceno(String deviceno) { - this.deviceno = deviceno == null ? null : deviceno.trim(); - } - - public Integer getBelonguserid() { - return belonguserid; - } - - public void setBelonguserid(Integer belonguserid) { - this.belonguserid = belonguserid; - } - - public Integer getExtractuserid() { - return extractuserid; - } - - public void setExtractuserid(Integer extractuserid) { - this.extractuserid = extractuserid; - } - - public String getRolecode() { - return rolecode; - } - - public void setRolecode(String rolecode) { - this.rolecode = rolecode == null ? null : rolecode.trim(); - } - - public Date getInstocktime() { - return instocktime; - } - - public void setInstocktime(Date instocktime) { - this.instocktime = instocktime; - } - - public String getTransferstatus() { - return transferstatus; - } - - public void setTransferstatus(String transferstatus) { - this.transferstatus = transferstatus == null ? null : transferstatus.trim(); - } - - public Date getBindtime() { - return bindtime; - } - - public void setBindtime(Date bindtime) { - this.bindtime = bindtime; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbIntegral.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbIntegral.java deleted file mode 100644 index ed52c85..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbIntegral.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -public class TbIntegral implements Serializable { - private Integer id; - - private String userId; - - private BigDecimal num; - - private String status; - - private Date createTime; - - private Date updateTime; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId == null ? null : userId.trim(); - } - - public BigDecimal getNum() { - return num; - } - - public void setNum(BigDecimal num) { - this.num = num; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status == null ? null : status.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbIntegralFlow.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbIntegralFlow.java deleted file mode 100644 index 888295e..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbIntegralFlow.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -public class TbIntegralFlow implements Serializable { - private Integer id; - - private String userId; - - private BigDecimal num; - - private Date createTime; - - private Date updateTime; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId == null ? null : userId.trim(); - } - - public BigDecimal getNum() { - return num; - } - - public void setNum(BigDecimal num) { - this.num = num; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMerchantCoupon.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMerchantCoupon.java deleted file mode 100644 index 4f5bee0..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMerchantCoupon.java +++ /dev/null @@ -1,420 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.util.Date; -import java.io.Serializable; - -/** - * 优惠券(TbMerchantCoupon)实体类 - * - * @author lyf - * @since 2024-04-02 09:22:41 - */ -public class TbMerchantCoupon implements Serializable { - private static final long serialVersionUID = 391103766508753856L; - /** - * 自增 - */ - private Integer id; - /** - * 状态0-关闭 1 正常 - */ - private Integer status; - /** - * 优惠券名称 - */ - private String title; - - private String templateId; - - private String shopId; - - private String shopSnap; - /** - * 开始时间 - */ - private Date fromTime; - /** - * 到期时间 - */ - private Date toTime; - /** - * 限领数量 - */ - private String limitNumber; - private String useNumber; - /** - * 发放数量 - */ - private Integer number; - /** - * 剩余数量 - */ - private String leftNumber; - /** - * 优惠金额 - */ - private Double amount; - /** - * 订单满赠金额 - */ - private Double limitAmount; - /** - * 是否显示0-不显示 1显示 - */ - private Integer isShow; - /** - * 图标 - */ - private String pic; - /** - * 0-满减 1-折扣 - */ - private Integer type; - /** - * 折扣 ，一位小数 - */ - private Float ratio; - /** - * 最大折扣金额 - */ - private Double maxRatioAmount; - /** - * 优惠券途径，首充|分销 - */ - private String track; - /** - * 品类product 商品券 ---cateogry 品类券common -通 用券 - */ - private String classType; - /** - * 有效期类型：0-toTime有效 1-effectDays有效 - */ - private Integer effectType; - /** - * 领取之日有效天数 - */ - private Integer effectDays; - /** - * 关联商品Id - */ - private String relationIds; - - private String relationList; - /** - * 发放人 - */ - private String editor; - /** - * 说明 - */ - private String note; - - private Long createdAt; - - private Long updatedAt; - /** - * 支持堂食 - */ - private Integer furnishMeal; - /** - * 支持配送 - */ - private Integer furnishExpress; - /** - * 支持自提 - */ - private Integer furnishDraw; - /** - * 支持虚拟 - */ - private Integer furnishVir; - - private Integer disableDistribute; - /** - * 商户Id - */ - private String merchantId; - - - public String getUseNumber() { - return useNumber; - } - - public void setUseNumber(String useNumber) { - this.useNumber = useNumber; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getTemplateId() { - return templateId; - } - - public void setTemplateId(String templateId) { - this.templateId = templateId; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getShopSnap() { - return shopSnap; - } - - public void setShopSnap(String shopSnap) { - this.shopSnap = shopSnap; - } - - public Date getFromTime() { - return fromTime; - } - - public void setFromTime(Date fromTime) { - this.fromTime = fromTime; - } - - public Date getToTime() { - return toTime; - } - - public void setToTime(Date toTime) { - this.toTime = toTime; - } - - public String getLimitNumber() { - return limitNumber; - } - - public void setLimitNumber(String limitNumber) { - this.limitNumber = limitNumber; - } - - public Integer getNumber() { - return number; - } - - public void setNumber(Integer number) { - this.number = number; - } - - public String getLeftNumber() { - return leftNumber; - } - - public void setLeftNumber(String leftNumber) { - this.leftNumber = leftNumber; - } - - public Double getAmount() { - return amount; - } - - public void setAmount(Double amount) { - this.amount = amount; - } - - public Double getLimitAmount() { - return limitAmount; - } - - public void setLimitAmount(Double limitAmount) { - this.limitAmount = limitAmount; - } - - public Integer getIsShow() { - return isShow; - } - - public void setIsShow(Integer isShow) { - this.isShow = isShow; - } - - public String getPic() { - return pic; - } - - public void setPic(String pic) { - this.pic = pic; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public Float getRatio() { - return ratio; - } - - public void setRatio(Float ratio) { - this.ratio = ratio; - } - - public Double getMaxRatioAmount() { - return maxRatioAmount; - } - - public void setMaxRatioAmount(Double maxRatioAmount) { - this.maxRatioAmount = maxRatioAmount; - } - - public String getTrack() { - return track; - } - - public void setTrack(String track) { - this.track = track; - } - - public String getClassType() { - return classType; - } - - public void setClassType(String classType) { - this.classType = classType; - } - - public Integer getEffectType() { - return effectType; - } - - public void setEffectType(Integer effectType) { - this.effectType = effectType; - } - - public Integer getEffectDays() { - return effectDays; - } - - public void setEffectDays(Integer effectDays) { - this.effectDays = effectDays; - } - - public String getRelationIds() { - return relationIds; - } - - public void setRelationIds(String relationIds) { - this.relationIds = relationIds; - } - - public String getRelationList() { - return relationList; - } - - public void setRelationList(String relationList) { - this.relationList = relationList; - } - - public String getEditor() { - return editor; - } - - public void setEditor(String editor) { - this.editor = editor; - } - - public String getNote() { - return note; - } - - public void setNote(String note) { - this.note = note; - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Long updatedAt) { - this.updatedAt = updatedAt; - } - - public Integer getFurnishMeal() { - return furnishMeal; - } - - public void setFurnishMeal(Integer furnishMeal) { - this.furnishMeal = furnishMeal; - } - - public Integer getFurnishExpress() { - return furnishExpress; - } - - public void setFurnishExpress(Integer furnishExpress) { - this.furnishExpress = furnishExpress; - } - - public Integer getFurnishDraw() { - return furnishDraw; - } - - public void setFurnishDraw(Integer furnishDraw) { - this.furnishDraw = furnishDraw; - } - - public Integer getFurnishVir() { - return furnishVir; - } - - public void setFurnishVir(Integer furnishVir) { - this.furnishVir = furnishVir; - } - - public Integer getDisableDistribute() { - return disableDistribute; - } - - public void setDisableDistribute(Integer disableDistribute) { - this.disableDistribute = disableDistribute; - } - - public String getMerchantId() { - return merchantId; - } - - public void setMerchantId(String merchantId) { - this.merchantId = merchantId; - } - -} - diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbParams.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbParams.java deleted file mode 100644 index 5aa9414..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbParams.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - - -@Data -public class TbParams implements Serializable { - private Integer id; - - private BigDecimal integralRatio; - private BigDecimal twoRatio; - - private BigDecimal tradeRatio; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPlussDeviceGoods.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPlussDeviceGoods.java deleted file mode 100644 index d3132cc..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPlussDeviceGoods.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.util.Date; - -public class TbPlussDeviceGoods implements Serializable { - private Integer id; - - private String code; - - private String name; - - private String devicelogo; - - private String introdesc; - - private Integer sort; - - private Integer status; - - private Integer tagid; - - private String depositflag; - - private Date createtime; - - private Date updatetime; - - private String detail; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code == null ? null : code.trim(); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getDevicelogo() { - return devicelogo; - } - - public void setDevicelogo(String devicelogo) { - this.devicelogo = devicelogo == null ? null : devicelogo.trim(); - } - - public String getIntrodesc() { - return introdesc; - } - - public void setIntrodesc(String introdesc) { - this.introdesc = introdesc == null ? null : introdesc.trim(); - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public Integer getTagid() { - return tagid; - } - - public void setTagid(Integer tagid) { - this.tagid = tagid; - } - - public String getDepositflag() { - return depositflag; - } - - public void setDepositflag(String depositflag) { - this.depositflag = depositflag == null ? null : depositflag.trim(); - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - public Date getUpdatetime() { - return updatetime; - } - - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; - } - - public String getDetail() { - return detail; - } - - public void setDetail(String detail) { - this.detail = detail == null ? null : detail.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReceiptSales.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReceiptSales.java deleted file mode 100644 index 1a38a26..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReceiptSales.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class TbReceiptSales implements Serializable { - private Integer id; - - private String title; - - private String logo; - - private Boolean showContactInfo; - - private Boolean showMember; - - private Boolean showMemberCode; - - private Boolean showMemberScore; - - private Boolean showMemberWallet; - - private String footerRemark; - - private Boolean showCashCharge; - - private Boolean showSerialNo; - - private Boolean bigSerialNo; - - private String headerText; - - private String headerTextAlign; - - private String footerText; - - private String footerTextAlign; - - private String footerImage; - - private String prePrint; - - private Long createdAt; - - private Long updatedAt; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title == null ? null : title.trim(); - } - - public String getLogo() { - return logo; - } - - public void setLogo(String logo) { - this.logo = logo == null ? null : logo.trim(); - } - - public Boolean getShowContactInfo() { - return showContactInfo; - } - - public void setShowContactInfo(Boolean showContactInfo) { - this.showContactInfo = showContactInfo; - } - - public Boolean getShowMember() { - return showMember; - } - - public void setShowMember(Boolean showMember) { - this.showMember = showMember; - } - - public Boolean getShowMemberCode() { - return showMemberCode; - } - - public void setShowMemberCode(Boolean showMemberCode) { - this.showMemberCode = showMemberCode; - } - - public Boolean getShowMemberScore() { - return showMemberScore; - } - - public void setShowMemberScore(Boolean showMemberScore) { - this.showMemberScore = showMemberScore; - } - - public Boolean getShowMemberWallet() { - return showMemberWallet; - } - - public void setShowMemberWallet(Boolean showMemberWallet) { - this.showMemberWallet = showMemberWallet; - } - - public String getFooterRemark() { - return footerRemark; - } - - public void setFooterRemark(String footerRemark) { - this.footerRemark = footerRemark == null ? null : footerRemark.trim(); - } - - public Boolean getShowCashCharge() { - return showCashCharge; - } - - public void setShowCashCharge(Boolean showCashCharge) { - this.showCashCharge = showCashCharge; - } - - public Boolean getShowSerialNo() { - return showSerialNo; - } - - public void setShowSerialNo(Boolean showSerialNo) { - this.showSerialNo = showSerialNo; - } - - public Boolean getBigSerialNo() { - return bigSerialNo; - } - - public void setBigSerialNo(Boolean bigSerialNo) { - this.bigSerialNo = bigSerialNo; - } - - public String getHeaderText() { - return headerText; - } - - public void setHeaderText(String headerText) { - this.headerText = headerText == null ? null : headerText.trim(); - } - - public String getHeaderTextAlign() { - return headerTextAlign; - } - - public void setHeaderTextAlign(String headerTextAlign) { - this.headerTextAlign = headerTextAlign == null ? null : headerTextAlign.trim(); - } - - public String getFooterText() { - return footerText; - } - - public void setFooterText(String footerText) { - this.footerText = footerText == null ? null : footerText.trim(); - } - - public String getFooterTextAlign() { - return footerTextAlign; - } - - public void setFooterTextAlign(String footerTextAlign) { - this.footerTextAlign = footerTextAlign == null ? null : footerTextAlign.trim(); - } - - public String getFooterImage() { - return footerImage; - } - - public void setFooterImage(String footerImage) { - this.footerImage = footerImage == null ? null : footerImage.trim(); - } - - public String getPrePrint() { - return prePrint; - } - - public void setPrePrint(String prePrint) { - this.prePrint = prePrint == null ? null : prePrint.trim(); - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Long updatedAt) { - this.updatedAt = updatedAt; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReleaseFlow.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReleaseFlow.java deleted file mode 100644 index 34414ed..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReleaseFlow.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -@Data -public class TbReleaseFlow implements Serializable { - private Integer id; - - private String userId; - - private BigDecimal num; - - private String type; - private String operationType; - - private String remark; - private String nickName; - - private String fromSource; - - private Date createTime; - private String createTr; - private String openId; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbRenewalsPayLog.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbRenewalsPayLog.java deleted file mode 100644 index 9a4bcbd..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbRenewalsPayLog.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class TbRenewalsPayLog implements Serializable { - private Integer id; - - private String payType; - - private String shopId; - - private String orderId; - - private String openId; - - private String userId; - - private String transactionId; - - private BigDecimal amount; - - private Byte status; - - private String remark; - - private String attach; - - private Long expiredAt; - - private Long createdAt; - - private Long updatedAt; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getPayType() { - return payType; - } - - public void setPayType(String payType) { - this.payType = payType == null ? null : payType.trim(); - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId == null ? null : shopId.trim(); - } - - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId == null ? null : orderId.trim(); - } - - public String getOpenId() { - return openId; - } - - public void setOpenId(String openId) { - this.openId = openId == null ? null : openId.trim(); - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId == null ? null : userId.trim(); - } - - public String getTransactionId() { - return transactionId; - } - - public void setTransactionId(String transactionId) { - this.transactionId = transactionId == null ? null : transactionId.trim(); - } - - public BigDecimal getAmount() { - return amount; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public Byte getStatus() { - return status; - } - - public void setStatus(Byte status) { - this.status = status; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - public String getAttach() { - return attach; - } - - public void setAttach(String attach) { - this.attach = attach == null ? null : attach.trim(); - } - - public Long getExpiredAt() { - return expiredAt; - } - - public void setExpiredAt(Long expiredAt) { - this.expiredAt = expiredAt; - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Long updatedAt) { - this.updatedAt = updatedAt; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpread.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpread.java deleted file mode 100644 index 1a6d486..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpread.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class TbShopCashSpread implements Serializable { - private Integer id; - - private Long createdAt; - - private Long updatedAt; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Long updatedAt) { - this.updatedAt = updatedAt; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpreadWithBLOBs.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpreadWithBLOBs.java deleted file mode 100644 index ac6cc8a..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpreadWithBLOBs.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class TbShopCashSpreadWithBLOBs extends TbShopCashSpread implements Serializable { - private String saleReceipt; - - private String triplicateReceipt; - - private String screenConfig; - - private String tagConfig; - - private String scaleConfig; - - private static final long serialVersionUID = 1L; - - public String getSaleReceipt() { - return saleReceipt; - } - - public void setSaleReceipt(String saleReceipt) { - this.saleReceipt = saleReceipt == null ? null : saleReceipt.trim(); - } - - public String getTriplicateReceipt() { - return triplicateReceipt; - } - - public void setTriplicateReceipt(String triplicateReceipt) { - this.triplicateReceipt = triplicateReceipt == null ? null : triplicateReceipt.trim(); - } - - public String getScreenConfig() { - return screenConfig; - } - - public void setScreenConfig(String screenConfig) { - this.screenConfig = screenConfig == null ? null : screenConfig.trim(); - } - - public String getTagConfig() { - return tagConfig; - } - - public void setTagConfig(String tagConfig) { - this.tagConfig = tagConfig == null ? null : tagConfig.trim(); - } - - public String getScaleConfig() { - return scaleConfig; - } - - public void setScaleConfig(String scaleConfig) { - this.scaleConfig = scaleConfig == null ? null : scaleConfig.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java new file mode 100644 index 0000000..fc54428 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java @@ -0,0 +1,288 @@ +package com.chaozhanggui.system.cashierservice.entity; + +import java.time.LocalTime; +import java.util.Date; +import java.io.Serializable; + +/** + * 优惠券(TbShopCoupon)实体类 + * + * @author ww + * @since 2024-10-24 10:40:00 + */ +public class TbShopCoupon implements Serializable { + private static final long serialVersionUID = 382961088281627909L; + /** + * 自增 + */ + private Integer id; + + private String shopId; + /** + * 名称(无意义) + */ + private String title; + /** + * 1-满减 2-商品 + */ + private Integer type; + /** + * 满多少金额 + */ + private Integer fullAmount; + /** + * 减多少金额 + */ + private Integer discountAmount; + /** + * 描述 + */ + private String description; + /** + * 发放数量 + */ + private Integer number; + /** + * 剩余数量 + */ + private Integer leftNumber; + /** + * 有效期类型，可选值为 fixed（固定时间）/custom（自定义时间） + */ + private String validityType; + /** + * 有效天数 + */ + private Integer validDays; + /** + * 隔多少天生效 + */ + private Integer daysToTakeEffect; + /** + * 有效开始时间 + */ + private Date validStartTime; + /** + * 有效结束时间 + */ + private Date validEndTime; + /** + * 周 数组["周一","周二"] + */ + private String userDays; + /** + * all-全时段 custom-指定时段 + */ + private String useTimeType; + /** + * 可用开始时间 + */ + private LocalTime useStartTime; + /** + * 可用结束时间 + */ + private LocalTime useEndTime; + /** + * 已使用数量 + */ + private Integer useNumber; + /** + * 发放人 + */ + private String editor; + /** + * 状态0-关闭 1 正常 + */ + private Integer status; + + private Date createTime; + + private Date updateTime; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getFullAmount() { + return fullAmount; + } + + public void setFullAmount(Integer fullAmount) { + this.fullAmount = fullAmount; + } + + public Integer getDiscountAmount() { + return discountAmount; + } + + public void setDiscountAmount(Integer discountAmount) { + this.discountAmount = discountAmount; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public Integer getLeftNumber() { + return leftNumber; + } + + public void setLeftNumber(Integer leftNumber) { + this.leftNumber = leftNumber; + } + + public String getValidityType() { + return validityType; + } + + public void setValidityType(String validityType) { + this.validityType = validityType; + } + + public Integer getValidDays() { + return validDays; + } + + public void setValidDays(Integer validDays) { + this.validDays = validDays; + } + + public Integer getDaysToTakeEffect() { + return daysToTakeEffect; + } + + public void setDaysToTakeEffect(Integer daysToTakeEffect) { + this.daysToTakeEffect = daysToTakeEffect; + } + + public Date getValidStartTime() { + return validStartTime; + } + + public void setValidStartTime(Date validStartTime) { + this.validStartTime = validStartTime; + } + + public Date getValidEndTime() { + return validEndTime; + } + + public void setValidEndTime(Date validEndTime) { + this.validEndTime = validEndTime; + } + + public String getUserDays() { + return userDays; + } + + public void setUserDays(String userDays) { + this.userDays = userDays; + } + + public String getUseTimeType() { + return useTimeType; + } + + public void setUseTimeType(String useTimeType) { + this.useTimeType = useTimeType; + } + + public LocalTime getUseStartTime() { + return useStartTime; + } + + public void setUseStartTime(LocalTime useStartTime) { + this.useStartTime = useStartTime; + } + + public LocalTime getUseEndTime() { + return useEndTime; + } + + public void setUseEndTime(LocalTime useEndTime) { + this.useEndTime = useEndTime; + } + + public Integer getUseNumber() { + return useNumber; + } + + public void setUseNumber(Integer useNumber) { + this.useNumber = useNumber; + } + + public String getEditor() { + return editor; + } + + public void setEditor(String editor) { + this.editor = editor; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrency.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrency.java deleted file mode 100644 index 4b71c95..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrency.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class TbShopCurrency implements Serializable { - private Integer id; - - private String shopId; - - private BigDecimal prepareAmount; - - private String currency; - - private Byte decimalsDigits; - - private String discountRound; - - private String merchantId; - - private Byte smallChange; - - private Byte enableCustomDiscount; - - private BigDecimal maxDiscount; - - private Double maxPercent; - - private String bizDuration; - - private Byte allowWebPay; - - private Byte isAutoToZero; - - private Byte isIncludeTaxPrice; - - private String taxNumber; - - private Long createdAt; - - private Long updatedAt; - - private Byte autoLockScreen; - - private Byte voiceNotification; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId == null ? null : shopId.trim(); - } - - public BigDecimal getPrepareAmount() { - return prepareAmount; - } - - public void setPrepareAmount(BigDecimal prepareAmount) { - this.prepareAmount = prepareAmount; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String currency) { - this.currency = currency == null ? null : currency.trim(); - } - - public Byte getDecimalsDigits() { - return decimalsDigits; - } - - public void setDecimalsDigits(Byte decimalsDigits) { - this.decimalsDigits = decimalsDigits; - } - - public String getDiscountRound() { - return discountRound; - } - - public void setDiscountRound(String discountRound) { - this.discountRound = discountRound == null ? null : discountRound.trim(); - } - - public String getMerchantId() { - return merchantId; - } - - public void setMerchantId(String merchantId) { - this.merchantId = merchantId == null ? null : merchantId.trim(); - } - - public Byte getSmallChange() { - return smallChange; - } - - public void setSmallChange(Byte smallChange) { - this.smallChange = smallChange; - } - - public Byte getEnableCustomDiscount() { - return enableCustomDiscount; - } - - public void setEnableCustomDiscount(Byte enableCustomDiscount) { - this.enableCustomDiscount = enableCustomDiscount; - } - - public BigDecimal getMaxDiscount() { - return maxDiscount; - } - - public void setMaxDiscount(BigDecimal maxDiscount) { - this.maxDiscount = maxDiscount; - } - - public Double getMaxPercent() { - return maxPercent; - } - - public void setMaxPercent(Double maxPercent) { - this.maxPercent = maxPercent; - } - - public String getBizDuration() { - return bizDuration; - } - - public void setBizDuration(String bizDuration) { - this.bizDuration = bizDuration == null ? null : bizDuration.trim(); - } - - public Byte getAllowWebPay() { - return allowWebPay; - } - - public void setAllowWebPay(Byte allowWebPay) { - this.allowWebPay = allowWebPay; - } - - public Byte getIsAutoToZero() { - return isAutoToZero; - } - - public void setIsAutoToZero(Byte isAutoToZero) { - this.isAutoToZero = isAutoToZero; - } - - public Byte getIsIncludeTaxPrice() { - return isIncludeTaxPrice; - } - - public void setIsIncludeTaxPrice(Byte isIncludeTaxPrice) { - this.isIncludeTaxPrice = isIncludeTaxPrice; - } - - public String getTaxNumber() { - return taxNumber; - } - - public void setTaxNumber(String taxNumber) { - this.taxNumber = taxNumber == null ? null : taxNumber.trim(); - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Long updatedAt) { - this.updatedAt = updatedAt; - } - - public Byte getAutoLockScreen() { - return autoLockScreen; - } - - public void setAutoLockScreen(Byte autoLockScreen) { - this.autoLockScreen = autoLockScreen; - } - - public Byte getVoiceNotification() { - return voiceNotification; - } - - public void setVoiceNotification(Byte voiceNotification) { - this.voiceNotification = voiceNotification; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrencyWithBLOBs.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrencyWithBLOBs.java deleted file mode 100644 index 5fc056b..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrencyWithBLOBs.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class TbShopCurrencyWithBLOBs extends TbShopCurrency implements Serializable { - private String discountConfigs; - - private String serviceCharge; - - private static final long serialVersionUID = 1L; - - public String getDiscountConfigs() { - return discountConfigs; - } - - public void setDiscountConfigs(String discountConfigs) { - this.discountConfigs = discountConfigs == null ? null : discountConfigs.trim(); - } - - public String getServiceCharge() { - return serviceCharge; - } - - public void setServiceCharge(String serviceCharge) { - this.serviceCharge = serviceCharge == null ? null : serviceCharge.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java index 708a336..0d0ecc2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java @@ -1,128 +1,785 @@ package com.chaozhanggui.system.cashierservice.entity; -import lombok.Data; - -import java.io.Serializable; import java.math.BigDecimal; +import java.io.Serializable; - -@Data +/** + * (TbShopInfo)实体类 + * + * @author ww + * @since 2024-10-23 15:03:55 + */ public class TbShopInfo implements Serializable { + private static final long serialVersionUID = -75915575260078554L; + /** + * 自增id + */ private Integer id; - + /** + * 店铺帐号 + */ private String account; - + /** + * 店铺代号，策略方式为city +店铺号（8位） + */ private String shopCode; - + /** + * 店铺口号 + */ private String subTitle; - + /** + * 商户Id + */ private String merchantId; - + /** + * 店铺名称 + */ private String shopName; - + /** + * 连锁店扩展店名 + */ private String chainName; - + /** + * 背景图 + */ private String backImg; - + /** + * 门头照 + */ private String frontImg; - + /** + * 联系人姓名 + */ private String contactName; - + /** + * 联系电话 + */ private String phone; - + /** + * 店铺log0 + */ private String logo; - - private Byte isDeposit; - - private Byte isSupply; - + /** + * 是否参与代收 0--不参与 1参与 + */ + private Integer isDeposit; + /** + * 是否为供应商 + */ + private Integer isSupply; + /** + * 封面图 + */ private String coverImg; - + /** + * 店铺分享图 + */ private String shareImg; - + /** + * 轮播图 + */ + private String view; + /** + * 店铺简介 + */ private String detail; - + /** + * 经纬度 + */ private String lat; - + /** + * 经纬度 + */ private String lng; - + /** + * 未用 + */ private String mchId; private String registerType; - - private Byte isWxMaIndependent; - + /** + * 是否独立的微信小程序 + */ + private Integer isWxMaIndependent; + /** + * 详细地址 + */ private String address; - + /** + * 类似于这种规则51.51.570 + */ private String city; - + /** + * 店铺类型 超市--MARKET---其它店SHOP + */ private String type; - + /** + * 行业 + */ private String industry; - + /** + * 行业名称 + */ private String industryName; - + /** + * 营业时间(周开始) + */ private String businessStartDay; + /** + * 营业时间(周结束) + */ private String businessEndDay; + /** + * 营业时间 + */ private String businessTime; - + /** + * 配送时间 + */ private String postTime; private BigDecimal postAmountLine; - - private Byte onSale; - - private Byte settleType; - + /** + * 0停业1，正常营业,网上售卖 + */ + private Integer onSale; + /** + * 0今日，1次日 + */ + private Integer settleType; + /** + * 时间 + */ private String settleTime; - + /** + * 入驻时间 + */ private Integer enterAt; - + /** + * 到期时间 + */ private Long expireAt; - - private Byte status; - - private Float average; - + /** + * -1 平台禁用 0-过期，1正式营业， + */ + private Integer status; + /** + * 人均消费 + */ + private BigDecimal average; + /** + * 订单等待时间 + */ private Integer orderWaitPayMinute; - + /** + * 支持登陆设备个数 + */ private Integer supportDeviceNumber; - - private Byte distributeLevel; + /** + * 分销层级（1-下级分销 2-两下级分销） + */ + private Integer distributeLevel; private Long createdAt; private Long updatedAt; private String proxyId; - - private String view; + /** + * trial试用版，release正式 + */ + private String profiles; /** * 商家二维码 */ private String shopQrcode; - private String isOpenYhq; - private Byte isUseVip; /** - * 商户标签 + * 商家标签 */ private String tag; - private String provinces; - private String cities; - private String districts; + private String isOpenYhq; + /** + * 0否1是 + */ + private Integer isUseVip; + /** + * 省 + */ + private String provinces; + /** + * 市 + */ + private String cities; + /** + * 区/县 + */ + private String districts; + /** + * 是否允许会员自定义金额 1 允许 0 不允许 + */ private String isCustom; - //是否开启桌位费 0否1是 + /** + * 是否开启退款密码 1 启用 0 禁用 + */ + private String isReturn; + /** + * 是否开启会员充值密码 1 启用 0 禁用 + */ + private String isMemberIn; + /** + * 是否开启会员退款密码 1 启用 0 禁用 + */ + private String isMemberReturn; + /** + * 是否免除桌位费 0否1是 + */ private Integer isTableFee; - //桌位费 + /** + * 是否启用会员价 0否1是 + */ + private Integer isMemberPrice; + /** + * 积分群体 all-所有 vip-仅针对会员 + */ + private String consumeColony; + /** + * 桌位费 + */ private BigDecimal tableFee; - //就餐模式 堂食 dine-in 外带 take-out + /** + * 就餐模式 堂食 dine-in 外带 take-out + */ private String eatModel; - //程序码(零点八零首页) + /** + * 小程序码(零点八零首页) + */ private String smallQrcode; - //店铺收款码 + /** + * 店铺收款码 + */ private String paymentQrcode; - private static final long serialVersionUID = 1L; -} \ No newline at end of file + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getShopCode() { + return shopCode; + } + + public void setShopCode(String shopCode) { + this.shopCode = shopCode; + } + + public String getSubTitle() { + return subTitle; + } + + public void setSubTitle(String subTitle) { + this.subTitle = subTitle; + } + + public String getMerchantId() { + return merchantId; + } + + public void setMerchantId(String merchantId) { + this.merchantId = merchantId; + } + + public String getShopName() { + return shopName; + } + + public void setShopName(String shopName) { + this.shopName = shopName; + } + + public String getChainName() { + return chainName; + } + + public void setChainName(String chainName) { + this.chainName = chainName; + } + + public String getBackImg() { + return backImg; + } + + public void setBackImg(String backImg) { + this.backImg = backImg; + } + + public String getFrontImg() { + return frontImg; + } + + public void setFrontImg(String frontImg) { + this.frontImg = frontImg; + } + + public String getContactName() { + return contactName; + } + + public void setContactName(String contactName) { + this.contactName = contactName; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getLogo() { + return logo; + } + + public void setLogo(String logo) { + this.logo = logo; + } + + public Integer getIsDeposit() { + return isDeposit; + } + + public void setIsDeposit(Integer isDeposit) { + this.isDeposit = isDeposit; + } + + public Integer getIsSupply() { + return isSupply; + } + + public void setIsSupply(Integer isSupply) { + this.isSupply = isSupply; + } + + public String getCoverImg() { + return coverImg; + } + + public void setCoverImg(String coverImg) { + this.coverImg = coverImg; + } + + public String getShareImg() { + return shareImg; + } + + public void setShareImg(String shareImg) { + this.shareImg = shareImg; + } + + public String getView() { + return view; + } + + public void setView(String view) { + this.view = view; + } + + public String getDetail() { + return detail; + } + + public void setDetail(String detail) { + this.detail = detail; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getMchId() { + return mchId; + } + + public void setMchId(String mchId) { + this.mchId = mchId; + } + + public String getRegisterType() { + return registerType; + } + + public void setRegisterType(String registerType) { + this.registerType = registerType; + } + + public Integer getIsWxMaIndependent() { + return isWxMaIndependent; + } + + public void setIsWxMaIndependent(Integer isWxMaIndependent) { + this.isWxMaIndependent = isWxMaIndependent; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getIndustry() { + return industry; + } + + public void setIndustry(String industry) { + this.industry = industry; + } + + public String getIndustryName() { + return industryName; + } + + public void setIndustryName(String industryName) { + this.industryName = industryName; + } + + public String getBusinessStartDay() { + return businessStartDay; + } + + public void setBusinessStartDay(String businessStartDay) { + this.businessStartDay = businessStartDay; + } + + public String getBusinessEndDay() { + return businessEndDay; + } + + public void setBusinessEndDay(String businessEndDay) { + this.businessEndDay = businessEndDay; + } + + public String getBusinessTime() { + return businessTime; + } + + public void setBusinessTime(String businessTime) { + this.businessTime = businessTime; + } + + public String getPostTime() { + return postTime; + } + + public void setPostTime(String postTime) { + this.postTime = postTime; + } + + public BigDecimal getPostAmountLine() { + return postAmountLine; + } + + public void setPostAmountLine(BigDecimal postAmountLine) { + this.postAmountLine = postAmountLine; + } + + public Integer getOnSale() { + return onSale; + } + + public void setOnSale(Integer onSale) { + this.onSale = onSale; + } + + public Integer getSettleType() { + return settleType; + } + + public void setSettleType(Integer settleType) { + this.settleType = settleType; + } + + public String getSettleTime() { + return settleTime; + } + + public void setSettleTime(String settleTime) { + this.settleTime = settleTime; + } + + public Integer getEnterAt() { + return enterAt; + } + + public void setEnterAt(Integer enterAt) { + this.enterAt = enterAt; + } + + public Long getExpireAt() { + return expireAt; + } + + public void setExpireAt(Long expireAt) { + this.expireAt = expireAt; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public BigDecimal getAverage() { + return average; + } + + public void setAverage(BigDecimal average) { + this.average = average; + } + + public Integer getOrderWaitPayMinute() { + return orderWaitPayMinute; + } + + public void setOrderWaitPayMinute(Integer orderWaitPayMinute) { + this.orderWaitPayMinute = orderWaitPayMinute; + } + + public Integer getSupportDeviceNumber() { + return supportDeviceNumber; + } + + public void setSupportDeviceNumber(Integer supportDeviceNumber) { + this.supportDeviceNumber = supportDeviceNumber; + } + + public Integer getDistributeLevel() { + return distributeLevel; + } + + public void setDistributeLevel(Integer distributeLevel) { + this.distributeLevel = distributeLevel; + } + + public Long getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Long createdAt) { + this.createdAt = createdAt; + } + + public Long getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Long updatedAt) { + this.updatedAt = updatedAt; + } + + public String getProxyId() { + return proxyId; + } + + public void setProxyId(String proxyId) { + this.proxyId = proxyId; + } + + public String getProfiles() { + return profiles; + } + + public void setProfiles(String profiles) { + this.profiles = profiles; + } + + public String getShopQrcode() { + return shopQrcode; + } + + public void setShopQrcode(String shopQrcode) { + this.shopQrcode = shopQrcode; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public String getIsOpenYhq() { + return isOpenYhq; + } + + public void setIsOpenYhq(String isOpenYhq) { + this.isOpenYhq = isOpenYhq; + } + + public Integer getIsUseVip() { + return isUseVip; + } + + public void setIsUseVip(Integer isUseVip) { + this.isUseVip = isUseVip; + } + + public String getProvinces() { + return provinces; + } + + public void setProvinces(String provinces) { + this.provinces = provinces; + } + + public String getCities() { + return cities; + } + + public void setCities(String cities) { + this.cities = cities; + } + + public String getDistricts() { + return districts; + } + + public void setDistricts(String districts) { + this.districts = districts; + } + + public String getIsCustom() { + return isCustom; + } + + public void setIsCustom(String isCustom) { + this.isCustom = isCustom; + } + + public String getIsReturn() { + return isReturn; + } + + public void setIsReturn(String isReturn) { + this.isReturn = isReturn; + } + + public String getIsMemberIn() { + return isMemberIn; + } + + public void setIsMemberIn(String isMemberIn) { + this.isMemberIn = isMemberIn; + } + + public String getIsMemberReturn() { + return isMemberReturn; + } + + public void setIsMemberReturn(String isMemberReturn) { + this.isMemberReturn = isMemberReturn; + } + + public Integer getIsTableFee() { + return isTableFee; + } + + public void setIsTableFee(Integer isTableFee) { + this.isTableFee = isTableFee; + } + + public Integer getIsMemberPrice() { + return isMemberPrice; + } + + public void setIsMemberPrice(Integer isMemberPrice) { + this.isMemberPrice = isMemberPrice; + } + + public String getConsumeColony() { + return consumeColony; + } + + public void setConsumeColony(String consumeColony) { + this.consumeColony = consumeColony; + } + + public BigDecimal getTableFee() { + return tableFee; + } + + public void setTableFee(BigDecimal tableFee) { + this.tableFee = tableFee; + } + + public String getEatModel() { + return eatModel; + } + + public void setEatModel(String eatModel) { + this.eatModel = eatModel; + } + + public String getSmallQrcode() { + return smallQrcode; + } + + public void setSmallQrcode(String smallQrcode) { + this.smallQrcode = smallQrcode; + } + + public String getPaymentQrcode() { + return paymentQrcode; + } + + public void setPaymentQrcode(String paymentQrcode) { + this.paymentQrcode = paymentQrcode; + } + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbSplitAccounts.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbSplitAccounts.java deleted file mode 100644 index 89408a0..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbSplitAccounts.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -@Data -//分配金额 -public class TbSplitAccounts implements Serializable { - private Integer id; - - private Integer merchantId;//商户ID - - private Integer shopId;//店铺ID - - private BigDecimal couponsPrice;//优惠券价值 - - private BigDecimal conponsAmount;//优惠券面额 - private BigDecimal originAmount;// - - private String isSplit; - - private BigDecimal orderAmount; - - private Date createTime; - - private Date splitTime; - - private String tradeDay; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserCoupons.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserCoupons.java deleted file mode 100644 index 13d7029..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserCoupons.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -@Data -public class TbUserCoupons implements Serializable{ - private Integer id; - - private String userId; - private String detail; - private Integer orderId; - - private BigDecimal couponsPrice; - - private BigDecimal couponsAmount; - private TbOrderInfo orderInfo; - - private String status; - private String isDouble; - - private Date createTime; - - private Date updateTime; - - private Date endTime; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbWiningParams.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbWiningParams.java deleted file mode 100644 index 6c513c1..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbWiningParams.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -@Data -public class TbWiningParams implements Serializable { - private Integer id; - - private BigDecimal minPrice; - - private BigDecimal maxPrice; - - private Integer winingNum; - - private Integer winingUserNum; - private String status; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbWiningUser.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbWiningUser.java deleted file mode 100644 index 3855259..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbWiningUser.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -@Data -public class TbWiningUser implements Serializable { - private Integer id; - - private String userName; - - private String orderNo; - - private BigDecimal orderAmount; - - private String isUser; - - private Date createTime; - - private String isRefund; - - private BigDecimal refundAmount; - - private String refundNo; - - private String refundPayType; - - private String tradeDay; - - private Date refundTime; - - - private static final long serialVersionUID = 1L; - public TbWiningUser(){ - super(); - } - public TbWiningUser(String userName,String orderNo,BigDecimal orderAmount, - String isUser,String tradeDay){ - this.createTime = new Date(); - this.userName = userName; - this.orderNo = orderNo; - this.orderAmount = orderAmount; - this.isUser = isUser; - this.tradeDay = tradeDay; - this.isRefund = "true"; - this.refundAmount = BigDecimal.ZERO; - this.refundPayType = "WX"; - - - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbYhqParams.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbYhqParams.java deleted file mode 100644 index 41e19af..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbYhqParams.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -@Data -public class TbYhqParams implements Serializable { - private Integer id; - - private String name; - - private BigDecimal minPrice; - - private BigDecimal maxPrice; - - private String status; - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/ViewOrder.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/ViewOrder.java deleted file mode 100644 index 1c33659..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/ViewOrder.java +++ /dev/null @@ -1,378 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class ViewOrder implements Serializable { - private BigDecimal aliPaidAmount; - - private Integer id; - - private BigDecimal amount; - - private BigDecimal bankPaidAmount; - - private String billingId; - - private BigDecimal cashPaidAmount; - - private Long createdAt; - - private Integer deductScore; - - private BigDecimal depositPaidAmount; - - private BigDecimal discountAmount; - - private BigDecimal freightAmount; - - private Byte isMaster; - - private Byte isVip; - - private String masterId; - - private String memberId; - - private String orderNo; - - private String orderType; - - private BigDecimal otherPaidAmount; - - private Long paidTime; - - private BigDecimal payAmount; - - private Integer productScore; - - private String productType; - - private String refOrderId; - - private Byte refundAble; - - private BigDecimal refundAmount; - - private String sendType; - - private BigDecimal settlementAmount; - - private String shopId; - - private BigDecimal smallChange; - - private String status; - - private String tableId; - - private String tableParty; - - private String terminalSnap; - - private String userId; - - private BigDecimal virtualPaidAmount; - - private BigDecimal wxPaidAmount; - - private String cartList; - - private static final long serialVersionUID = 1L; - - public BigDecimal getAliPaidAmount() { - return aliPaidAmount; - } - - public void setAliPaidAmount(BigDecimal aliPaidAmount) { - this.aliPaidAmount = aliPaidAmount; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public BigDecimal getAmount() { - return amount; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public BigDecimal getBankPaidAmount() { - return bankPaidAmount; - } - - public void setBankPaidAmount(BigDecimal bankPaidAmount) { - this.bankPaidAmount = bankPaidAmount; - } - - public String getBillingId() { - return billingId; - } - - public void setBillingId(String billingId) { - this.billingId = billingId == null ? null : billingId.trim(); - } - - public BigDecimal getCashPaidAmount() { - return cashPaidAmount; - } - - public void setCashPaidAmount(BigDecimal cashPaidAmount) { - this.cashPaidAmount = cashPaidAmount; - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Integer getDeductScore() { - return deductScore; - } - - public void setDeductScore(Integer deductScore) { - this.deductScore = deductScore; - } - - public BigDecimal getDepositPaidAmount() { - return depositPaidAmount; - } - - public void setDepositPaidAmount(BigDecimal depositPaidAmount) { - this.depositPaidAmount = depositPaidAmount; - } - - public BigDecimal getDiscountAmount() { - return discountAmount; - } - - public void setDiscountAmount(BigDecimal discountAmount) { - this.discountAmount = discountAmount; - } - - public BigDecimal getFreightAmount() { - return freightAmount; - } - - public void setFreightAmount(BigDecimal freightAmount) { - this.freightAmount = freightAmount; - } - - public Byte getIsMaster() { - return isMaster; - } - - public void setIsMaster(Byte isMaster) { - this.isMaster = isMaster; - } - - public Byte getIsVip() { - return isVip; - } - - public void setIsVip(Byte isVip) { - this.isVip = isVip; - } - - public String getMasterId() { - return masterId; - } - - public void setMasterId(String masterId) { - this.masterId = masterId == null ? null : masterId.trim(); - } - - public String getMemberId() { - return memberId; - } - - public void setMemberId(String memberId) { - this.memberId = memberId == null ? null : memberId.trim(); - } - - public String getOrderNo() { - return orderNo; - } - - public void setOrderNo(String orderNo) { - this.orderNo = orderNo == null ? null : orderNo.trim(); - } - - public String getOrderType() { - return orderType; - } - - public void setOrderType(String orderType) { - this.orderType = orderType == null ? null : orderType.trim(); - } - - public BigDecimal getOtherPaidAmount() { - return otherPaidAmount; - } - - public void setOtherPaidAmount(BigDecimal otherPaidAmount) { - this.otherPaidAmount = otherPaidAmount; - } - - public Long getPaidTime() { - return paidTime; - } - - public void setPaidTime(Long paidTime) { - this.paidTime = paidTime; - } - - public BigDecimal getPayAmount() { - return payAmount; - } - - public void setPayAmount(BigDecimal payAmount) { - this.payAmount = payAmount; - } - - public Integer getProductScore() { - return productScore; - } - - public void setProductScore(Integer productScore) { - this.productScore = productScore; - } - - public String getProductType() { - return productType; - } - - public void setProductType(String productType) { - this.productType = productType == null ? null : productType.trim(); - } - - public String getRefOrderId() { - return refOrderId; - } - - public void setRefOrderId(String refOrderId) { - this.refOrderId = refOrderId == null ? null : refOrderId.trim(); - } - - public Byte getRefundAble() { - return refundAble; - } - - public void setRefundAble(Byte refundAble) { - this.refundAble = refundAble; - } - - public BigDecimal getRefundAmount() { - return refundAmount; - } - - public void setRefundAmount(BigDecimal refundAmount) { - this.refundAmount = refundAmount; - } - - public String getSendType() { - return sendType; - } - - public void setSendType(String sendType) { - this.sendType = sendType == null ? null : sendType.trim(); - } - - public BigDecimal getSettlementAmount() { - return settlementAmount; - } - - public void setSettlementAmount(BigDecimal settlementAmount) { - this.settlementAmount = settlementAmount; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId == null ? null : shopId.trim(); - } - - public BigDecimal getSmallChange() { - return smallChange; - } - - public void setSmallChange(BigDecimal smallChange) { - this.smallChange = smallChange; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status == null ? null : status.trim(); - } - - public String getTableId() { - return tableId; - } - - public void setTableId(String tableId) { - this.tableId = tableId == null ? null : tableId.trim(); - } - - public String getTableParty() { - return tableParty; - } - - public void setTableParty(String tableParty) { - this.tableParty = tableParty == null ? null : tableParty.trim(); - } - - public String getTerminalSnap() { - return terminalSnap; - } - - public void setTerminalSnap(String terminalSnap) { - this.terminalSnap = terminalSnap == null ? null : terminalSnap.trim(); - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId == null ? null : userId.trim(); - } - - public BigDecimal getVirtualPaidAmount() { - return virtualPaidAmount; - } - - public void setVirtualPaidAmount(BigDecimal virtualPaidAmount) { - this.virtualPaidAmount = virtualPaidAmount; - } - - public BigDecimal getWxPaidAmount() { - return wxPaidAmount; - } - - public void setWxPaidAmount(BigDecimal wxPaidAmount) { - this.wxPaidAmount = wxPaidAmount; - } - - public String getCartList() { - return cartList; - } - - public void setCartList(String cartList) { - this.cartList = cartList == null ? null : cartList.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/CouponDto.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/CouponDto.java new file mode 100644 index 0000000..3e18d1e --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/CouponDto.java @@ -0,0 +1,11 @@ +package com.chaozhanggui.system.cashierservice.entity.dto; + +import lombok.Data; +@Data +public class CouponDto { + private Integer shopId; + private Integer userId; + //-1已过期 1未使用 2已使用 + private Integer status; + private Integer orderId; +} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/GroupOrderDetailsVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/GroupOrderDetailsVo.java index cee294b..9dfc193 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/GroupOrderDetailsVo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/GroupOrderDetailsVo.java @@ -55,7 +55,7 @@ public class GroupOrderDetailsVo { * 商家名称 */ private String shopName; - private Byte isUseVip; + private Integer isUseVip; /** * 商家电话 */ diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralFlowVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralFlowVo.java deleted file mode 100644 index 12cfe06..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralFlowVo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity.vo; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @author lyf - */ -@Data -public class IntegralFlowVo { - private String openId; - private Integer page; - private Integer pageSize; - private String sign; - -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralVo.java deleted file mode 100644 index c26ab36..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity.vo; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @author lyf - */ -@Data -public class IntegralVo { - //openId - private String openId; - //数量 - private BigDecimal num; - //类型 - private String type; - //签名 - private String sign; - -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderConfirmVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderConfirmVo.java index 1e774e4..5ffcca6 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderConfirmVo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderConfirmVo.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; public class OrderConfirmVo { private String proId; private String shopId; - private Byte isUseVip; + private Integer isUseVip; /** * 商品图片 */ diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java new file mode 100644 index 0000000..1e787be --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java @@ -0,0 +1,30 @@ +package com.chaozhanggui.system.cashierservice.entity.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class TbUserCouponVo { + private Integer couponId; + private Integer proId; + //优惠券名称 + private String name; + //优惠券类型 1 满减 2 商品券 + private Integer type; + //数量 + private Integer num; + //到期时间 + private Date endTime; + private Long expireTime; + private String useRestrictions; + private boolean isUse = false; + + + public void setEndTime(Date endTime) { + this.endTime = endTime; + if(endTime!=null){ + expireTime=endTime.getTime(); + } + } +} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java deleted file mode 100644 index a2c7723..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity.vo; - -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class UserCouponVo { - /** - * 2 会员商品卷 - */ - private Integer type; - /** - * 卷描述 - */ - private String detail; - private String shopId; - private String shopName; - private String orderId; - /** - * 优惠金额 - */ - private BigDecimal couponsPrice = BigDecimal.ZERO; - /** - * 多少可用 - */ - private BigDecimal couponsAmount = BigDecimal.ZERO; - /** - * 数量 - */ - private Integer num; - /** - * 卷状态 0 未使用 - */ - private String status; -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/VipProductsLimits.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/VipProductsLimits.java deleted file mode 100644 index 74f091b..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/VipProductsLimits.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity.vo; - -import com.chaozhanggui.system.cashierservice.entity.TbProduct; -import lombok.Data; - -@Data -public class VipProductsLimits extends TbProduct { - - private Integer vipLimitNumber; - -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/IntegralConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/IntegralConsumer.java deleted file mode 100644 index a4155f3..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/IntegralConsumer.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.chaozhanggui.system.cashierservice.rabbit; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.chaozhanggui.system.cashierservice.redis.RedisUtil; -import com.chaozhanggui.system.cashierservice.service.IntegralService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.annotation.RabbitHandler; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -@Slf4j -@Component -@RabbitListener(queues = {RabbitConstants.INTEGRAL_QUEUE_PUT}) -@Service -public class IntegralConsumer { - - - @Autowired - private RedisUtil redisUtil; - @Autowired - private IntegralService integralService; - @RabbitHandler - public void listener(String message) { - try { - JSONObject jsonObject = JSON.parseObject(message); - integralService.integralAdd(jsonObject); - } catch (Exception e) { - e.getMessage(); - } - } - - -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index 32c50c8..2dd70c4 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -76,10 +76,6 @@ public class CartService { private TbOrderDetailMapper orderDetailMapper; @Autowired private TbShopTableMapper shopTableMapper; - @Autowired - private TbUserCouponsMapper userCouponsMapper; - @Autowired - private TbSystemCouponsMapper systemCouponsMapper; private final TbUserShopMsgMapper tbUserShopMsgMapper; private final WechatUtil wechatUtil; @@ -843,27 +839,6 @@ public class CartService { cart.setPackFee(BigDecimal.ZERO); } - if (cart.getIsVip().equals((byte) 1)) { - if (isVip) { - int i1 = activateInRecordService.queryByVipIdAndShopIdAndProId( - Integer.valueOf(tbShopUser.getId()), Integer.valueOf(shopId), Integer.valueOf(cart.getProductId())); - if (i1 < cart.getTotalNumber()) { - JSONObject jsonObject1 = new JSONObject(); - jsonObject1.put("status", "fail"); - jsonObject1.put("msg", "会员商品[" + cart.getName() + "],可下单数量为" + i1); - jsonObject1.put("data", new ArrayList<>()); - PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(), tableCartKey, jsonObject.getString("userId"), true); - continue; - } - } else { - JSONObject jsonObject1 = new JSONObject(); - jsonObject1.put("status", "fail"); - jsonObject1.put("msg", "非会员用户不可下单会员商品"); - jsonObject1.put("data", new ArrayList<>()); - PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(), tableCartKey, jsonObject.getString("userId"), true); - continue; - } - } TbProductSkuWithBLOBs tbProduct; if (!"-999".equals(cart.getProductId())) { tbProduct = productSkuMapper.selectByPrimaryKey(Integer.valueOf(cart.getSkuId())); @@ -966,63 +941,6 @@ public class CartService { //生成订单 TbOrderInfo orderInfo = orderInfoMapper.selectByPrimaryKey(orderId); - //优惠卷 - String isBuyYhq = "false"; - String isuseYhq = "false"; - if (jsonObject.containsKey("isYhq") && jsonObject.getString("isYhq").equals("1")) { - couponId = jsonObject.getString("couponsId"); - //1:购买优惠券，0：自己持有优惠券 - Integer couponsId = jsonObject.getInteger("couponsId"); - if (jsonObject.getString("isBuyYhq").equals("1")) { - TbSystemCoupons systemCoupons = systemCouponsMapper.selectByPrimaryKey(couponsId); - if (Objects.isNull(systemCoupons) || !systemCoupons.getStatus().equals("0")) { - log.info("开始处理订单"); - responseData.put("status", "fail"); - responseData.put("msg", "优惠券已售空"); - responseData.put("type", jsonObject.getString("type")); - responseData.put("data", ""); - PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(responseData.toString(), tableCartKey, jsonObject.getString("userId"), true); - log.info("消息推送"); - return Result.fail("优惠券已售空"); - } - if (N.gt(systemCoupons.getCouponsAmount(), totalAmount)) { - log.info("开始处理订单"); - responseData.put("status", "fail"); - responseData.put("msg", "订单金额小于优惠价金额"); - responseData.put("type", jsonObject.getString("type")); - responseData.put("data", ""); - PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(responseData.toString(), tableCartKey, jsonObject.getString("userId"), true); - log.info("消息推送"); - return Result.fail("订单金额小于优惠价金额"); - } - totalAmount = totalAmount.add(systemCoupons.getCouponsPrice()).subtract(systemCoupons.getCouponsAmount()); - originAmount = originAmount.add(systemCoupons.getCouponsPrice()); - couponAmount = systemCoupons.getCouponsAmount(); - systemCoupons.setStatus("1"); - systemCouponsMapper.updateByPrimaryKeySelective(systemCoupons); - TbUserCoupons userCoupons = new TbUserCoupons(); - userCoupons.setEndTime(DateUtils.getNewDate(new Date(), 3, systemCoupons.getDayNum())); - userCoupons.setCouponsAmount(systemCoupons.getCouponsAmount()); - userCoupons.setCouponsPrice(systemCoupons.getCouponsPrice()); - userCoupons.setStatus("1"); - userCoupons.setUserId(userId); - userCoupons.setCreateTime(new Date()); - userCouponsMapper.insert(userCoupons); - couponId = userCoupons.getId() + ""; - couponAmount = userCoupons.getCouponsAmount(); - } else { - TbUserCoupons userCoupons = userCouponsMapper.selectByPrimaryKey(couponsId); - - totalAmount = totalAmount.subtract(userCoupons.getCouponsAmount()); - userCoupons.setStatus("1"); - userCoupons.setEndTime(DateUtils.getNewDate(new Date(), 5, 30)); - userCouponsMapper.updateByPrimaryKeySelective(userCoupons); - couponAmount = userCoupons.getCouponsAmount(); - } - isuseYhq = "true"; - - } - if (orderInfo != null) { log.info("订单状态：" + orderInfo.getStatus()); if (!"unpaid".equals(orderInfo.getStatus())) { @@ -1044,8 +962,6 @@ public class CartService { orderInfo.setOrderAmount(totalAmount.add(packAMount)); orderInfo.setFreightAmount(BigDecimal.ZERO); orderInfo.setProductAmount(saleAmount); - orderInfo.setIsBuyCoupon(isBuyYhq); - orderInfo.setIsUseCoupon(isuseYhq); orderInfo.setRemark(remark); orderInfo.setUserId(userId); if (hasNewInfo) { @@ -1061,8 +977,6 @@ public class CartService { orderInfo.setMerchantId(String.valueOf(tbMerchantAccount.getId())); orderInfo.setUserCouponId(couponId); orderInfo.setOriginAmount(originAmount); - orderInfo.setIsBuyCoupon(isBuyYhq); - orderInfo.setIsUseCoupon(isuseYhq); orderInfo.setUserCouponAmount(couponAmount); orderInfo.setRemark(remark); orderInfo.setUserId(userId); @@ -1104,29 +1018,7 @@ public class CartService { } // 去除餐位费信息 - - List outRecords = new ArrayList<>(); for (TbCashierCart cashierCart : cashierCartList) { - if (!cashierCart.getProductId().equals("-999") && cashierCart.getIsVip().equals((byte) 1)) { - List actInRecords = activateInRecordService.queryAllByVipIdAndShopIdAndProId( - Integer.valueOf(tbShopUser.getId()), Integer.valueOf(orderInfo.getShopId()), Integer.valueOf(cashierCart.getProductId())); - Integer totalNumber = cashierCart.getTotalNumber(); - for (TbActivateInRecord actInRecord : actInRecords) { - if (totalNumber > 0) { - if (actInRecord.getOverNum() > totalNumber) { - TbActivateOutRecord outRecord = new TbActivateOutRecord(actInRecord.getId(), actInRecord.getProId(), totalNumber, orderInfo.getId().toString(), "create"); - outRecords.add(outRecord); - activateInRecordService.updateOverNumById(actInRecord.getId(), actInRecord.getOverNum() - totalNumber); - break; - } else { - TbActivateOutRecord outRecord = new TbActivateOutRecord(actInRecord.getId(), actInRecord.getProId(), actInRecord.getOverNum(), orderInfo.getId().toString(), "create"); - outRecords.add(outRecord); - activateInRecordService.updateOverNumById(actInRecord.getId(), 0); - totalNumber = totalNumber - actInRecord.getOverNum(); - } - } - } - } cashierCart.setUpdatedAt(System.currentTimeMillis()); cashierCart.setOrderId(orderId + ""); if ((!TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId()) && !shopEatTypeInfoDTO.isDineInAfter()) @@ -1145,7 +1037,6 @@ public class CartService { // cashierCartMapper.deleteByPrimaryKey(seatCartInfo.getId()); // } - if (!CollectionUtils.isEmpty(outRecords)) outRecordMapper.insertBatch(outRecords); // 打印票据 if (!addOrderDetail.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) { @@ -1354,84 +1245,6 @@ public class CartService { TbShopTable shopTable = shopTableMapper.selectQRcode(jsonObject.getString("tableId")); //生成订单 TbOrderInfo orderInfo = orderInfoMapper.selectByPrimaryKey(orderId); - String isBuyYhq = "false"; - String isuseYhq = "false"; - if (jsonObject.containsKey("isYhq") && jsonObject.getString("isYhq").equals("1")) { - couponId = jsonObject.getString("couponsId"); - //1:购买优惠券，0：自己持有优惠券 - Integer couponsId = jsonObject.getInteger("couponsId"); - if (jsonObject.getString("isBuyYhq").equals("1")) { - TbSystemCoupons systemCoupons = systemCouponsMapper.selectByPrimaryKey(couponsId); - if (Objects.isNull(systemCoupons) || !systemCoupons.getStatus().equals("0")) { - log.info("开始处理订单"); - JSONObject jsonObject1 = new JSONObject(); - jsonObject1.put("status", "fail"); - jsonObject1.put("msg", "优惠券已售空"); - jsonObject1.put("type", jsonObject.getString("type")); - jsonObject1.put("data", ""); - PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(), tableCartKey, jsonObject.getString("userId"), true); - log.info("消息推送"); - return; - } - if (N.gt(systemCoupons.getCouponsAmount(), totalAmount)) { - log.info("开始处理订单"); - JSONObject jsonObject1 = new JSONObject(); - jsonObject1.put("status", "fail"); - jsonObject1.put("msg", "订单金额小于优惠价金额"); - jsonObject1.put("type", jsonObject.getString("type")); - jsonObject1.put("data", ""); - PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(), tableCartKey, jsonObject.getString("userId"), true); - log.info("消息推送"); - return; - } - totalAmount = totalAmount.add(systemCoupons.getCouponsPrice()).subtract(systemCoupons.getCouponsAmount()); - originAmount = originAmount.add(systemCoupons.getCouponsPrice()); - couponAmount = systemCoupons.getCouponsAmount(); - systemCoupons.setStatus("1"); - systemCouponsMapper.updateByPrimaryKeySelective(systemCoupons); - TbUserCoupons userCoupons = new TbUserCoupons(); - userCoupons.setEndTime(DateUtils.getNewDate(new Date(), 3, systemCoupons.getDayNum())); - userCoupons.setCouponsAmount(systemCoupons.getCouponsAmount()); - userCoupons.setCouponsPrice(systemCoupons.getCouponsPrice()); - userCoupons.setStatus("1"); - userCoupons.setUserId(userId); - userCoupons.setCreateTime(new Date()); - userCouponsMapper.insert(userCoupons); - couponId = userCoupons.getId() + ""; - couponAmount = userCoupons.getCouponsAmount(); - } else { - TbUserCoupons userCoupons = userCouponsMapper.selectByPrimaryKey(couponsId); - if (Objects.isNull(userCoupons) || !userCoupons.getStatus().equals("0")) { - log.info("开始处理订单"); - JSONObject jsonObject1 = new JSONObject(); - jsonObject1.put("status", "fail"); - jsonObject1.put("msg", "优惠券已使用"); - jsonObject1.put("type", jsonObject.getString("type")); - jsonObject1.put("data", ""); - PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(), tableCartKey, jsonObject.getString("userId"), true); - log.info("消息推送"); - return; - } - if (N.gt(userCoupons.getCouponsAmount(), totalAmount)) { - log.info("开始处理订单"); - JSONObject jsonObject1 = new JSONObject(); - jsonObject1.put("status", "fail"); - jsonObject1.put("msg", "订单金额小于优惠价金额"); - jsonObject1.put("type", jsonObject.getString("type")); - jsonObject1.put("data", ""); - PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(), tableCartKey, jsonObject.getString("userId"), true); - log.info("消息推送"); - return; - } - totalAmount = totalAmount.subtract(userCoupons.getCouponsAmount()); - userCoupons.setStatus("1"); - userCoupons.setEndTime(DateUtils.getNewDate(new Date(), 5, 30)); - userCouponsMapper.updateByPrimaryKeySelective(userCoupons); - couponAmount = userCoupons.getCouponsAmount(); - } - isuseYhq = "true"; - - } if (Objects.nonNull(orderInfo)) { log.info("订单状态：" + orderInfo.getStatus()); if (!"unpaid".equals(orderInfo.getStatus())) { @@ -1456,16 +1269,12 @@ public class CartService { orderInfo.setOrderAmount(totalAmount.add(packAMount)); orderInfo.setFreightAmount(BigDecimal.ZERO); orderInfo.setProductAmount(saleAmount); - orderInfo.setIsBuyCoupon(isBuyYhq); - orderInfo.setIsUseCoupon(isuseYhq); orderInfoMapper.updateByPrimaryKeySelective(orderInfo); } else { orderInfo = getOrder(totalAmount, packAMount, shopTable, tbMerchantAccount.getId().toString(), jsonObject, originAmount); orderInfo.setMerchantId(String.valueOf(tbMerchantAccount.getId())); orderInfo.setUserCouponId(couponId); orderInfo.setOriginAmount(originAmount); - orderInfo.setIsBuyCoupon(isBuyYhq); - orderInfo.setIsUseCoupon(isuseYhq); orderInfo.setUserCouponAmount(couponAmount); JSONObject object = new JSONObject(); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CashierCartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CashierCartService.java deleted file mode 100644 index 760fdfa..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CashierCartService.java +++ /dev/null @@ -1,156 +0,0 @@ -//package com.chaozhanggui.system.cashierservice.service; -// -//import com.chaozhanggui.system.cashierservice.dao.TbCashierCartMapper; -//import com.chaozhanggui.system.cashierservice.dao.TbProductMapper; -//import com.chaozhanggui.system.cashierservice.dao.TbProductSkuMapper; -//import com.chaozhanggui.system.cashierservice.entity.TbCashierCart; -//import com.chaozhanggui.system.cashierservice.entity.TbProduct; -//import com.chaozhanggui.system.cashierservice.entity.TbProductSku; -//import com.chaozhanggui.system.cashierservice.entity.dto.ProductCartDto; -//import com.chaozhanggui.system.cashierservice.entity.vo.CashierCarVo; -//import com.chaozhanggui.system.cashierservice.exception.MsgException; -//import com.chaozhanggui.system.cashierservice.sign.CodeEnum; -//import com.chaozhanggui.system.cashierservice.sign.Result; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.beans.BeanUtils; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.annotation.Transactional; -// -//import javax.annotation.Resource; -//import java.math.BigDecimal; -//import java.time.Instant; -//import java.util.ArrayList; -//import java.util.HashMap; -//import java.util.List; -// -///** -// * @author lyf -// */ -//@Service -//@Slf4j -//public class CashierCartService { -// @Resource -// private TbCashierCartMapper cashierCartMapper; -// @Resource -// private TbProductMapper productMapper; -// @Resource -// private TbProductSkuMapper productSkuMapper; -// -// /** -// * 增加购物车 -// * @param productCartDto -// * @return -// */ -// @Transactional(rollbackFor = Exception.class) -// public Result batchAdd(ProductCartDto productCartDto){ -// //首先确认金额 -// TbProduct tbProduct = productMapper.selectById(Integer.valueOf(productCartDto.getProductId())); -// if (tbProduct == null){ -// return Result.fail("商品信息不存在"); -// } -// -// TbCashierCart cashierCart = cashierCartMapper.selectByProduct(productCartDto.getProductId(), productCartDto.getTableId()); -// if (cashierCart != null){ -// if ("add".equals(productCartDto.getType())){ -// TbCashierCart cashierCartNow = new TbCashierCart(); -// cashierCartNow.setNumber(cashierCart.getNumber()+1F); -// cashierCartNow.setId(cashierCart.getId()); -// cashierCartMapper.updateByPrimaryKeySelective(cashierCartNow); -// return Result.success(CodeEnum.ENCRYPT); -// }else if ("minus".equals(productCartDto.getType())){ -// TbCashierCart cashierCartNow = new TbCashierCart(); -// cashierCartNow.setNumber(cashierCart.getNumber()-1F); -// cashierCartNow.setId(cashierCart.getId()); -// if (cashierCartNow.getNumber() == 0F){ -// cashierCartNow.setStatus("clear"); -// cashierCartMapper.updateByPrimaryKeySelective(cashierCartNow); -// return Result.success(CodeEnum.ENCRYPT); -// } -// cashierCartMapper.updateByPrimaryKeySelective(cashierCartNow); -// return Result.success(CodeEnum.ENCRYPT); -// }else { -// throw new MsgException("添加购物车失败"); -// } -// } -// //增加新的购物车 -// TbCashierCart tbCashierCart = new TbCashierCart(); -// BeanUtils.copyProperties(productCartDto,tbCashierCart); -// tbCashierCart.setSalePrice(tbProduct.getLowPrice()); -// tbCashierCart.setCreatedAt(Instant.now().toEpochMilli()); -// tbCashierCart.setUpdatedAt(Instant.now().toEpochMilli()); -// tbCashierCart.setTotalNumber(0.00F); -// tbCashierCart.setRefundNumber(0.00F); -// tbCashierCart.setType((byte) 0); -// tbCashierCart.setSkuId(productCartDto.getSkuInfo()); -// //购物车状态打开 -// tbCashierCart.setStatus("open"); -// -// int insert = cashierCartMapper.insertSelective(tbCashierCart); -// if (insert>0){ -// return Result.success(CodeEnum.SUCCESS); -// } -// throw new MsgException("添加购物车失败"); -// } -// -// -// public Result cartList(Integer tableId){ -// HashMap map = new HashMap<>(); -// List tbCashierCarts = cashierCartMapper.selectByTableId(tableId); -// BigDecimal total = new BigDecimal("0.00"); -// for (TbCashierCart date :tbCashierCarts) { -// Float number = date.getNumber(); -// BigDecimal bigDecimalValue = new BigDecimal(number.toString()); -// total=total.add(bigDecimalValue.multiply(date.getSalePrice())); -// } -// -// map.put("cartList",tbCashierCarts); -// map.put("total",total); -// -// return Result.success(CodeEnum.ENCRYPT,map); -// -// } -// @Transactional(rollbackFor = Exception.class) -// public Result updateNumber(Integer tableId,String type){ -// TbCashierCart cashierCart = cashierCartMapper.selectByPrimaryKey(tableId); -// if (cashierCart == null){ -// return Result.fail("商品不存在"); -// } -// if ("add".equals(type)){ -// TbCashierCart cashierCartNow = new TbCashierCart(); -// cashierCartNow.setNumber(cashierCart.getNumber()+1F); -// cashierCartNow.setId(cashierCart.getId()); -// cashierCartMapper.updateByPrimaryKeySelective(cashierCartNow); -// return Result.success(CodeEnum.ENCRYPT); -// }else if ("minus".equals(type)){ -// TbCashierCart cashierCartNow = new TbCashierCart(); -// cashierCartNow.setNumber(cashierCart.getNumber()-1F); -// cashierCartNow.setId(cashierCart.getId()); -// if (cashierCartNow.getNumber() == 0F){ -// cashierCartNow.setStatus("clear"); -// cashierCartMapper.updateByPrimaryKeySelective(cashierCartNow); -// return Result.success(CodeEnum.ENCRYPT); -// } -// cashierCartMapper.updateByPrimaryKeySelective(cashierCartNow); -// return Result.success(CodeEnum.ENCRYPT); -// }else { -// throw new MsgException("更改商品失败"); -// } -// -// } -// @Transactional(rollbackFor = Exception.class) -// public Result clearCart(Integer tableId){ -// List cashierCarVos = cashierCartMapper.selectByTableIdOpen(tableId); -// if (cashierCarVos.isEmpty()){ -// return Result.fail("购物车内无商品"); -// } -// List ids = new ArrayList<>(); -// for (CashierCarVo date :cashierCarVos) { -// ids.add(date.getId()); -// } -// int i = cashierCartMapper.updateByIdsStatus(ids, Instant.now().toEpochMilli()); -// if (i != ids.size()){ -// throw new MsgException("清空购物车失败"); -// } -// return Result.success(CodeEnum.ENCRYPT); -// } -//} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/IntegralService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/IntegralService.java deleted file mode 100644 index 3d948da..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/IntegralService.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.chaozhanggui.system.cashierservice.service; - -import com.alibaba.fastjson.JSONObject; -import com.chaozhanggui.system.cashierservice.dao.*; -import com.chaozhanggui.system.cashierservice.entity.*; -import com.chaozhanggui.system.cashierservice.exception.MsgException; -import com.chaozhanggui.system.cashierservice.redis.RedisUtil; -import com.chaozhanggui.system.cashierservice.util.DateUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.text.ParseException; -import java.util.*; - -/** - * @author lyf - */ -@Service -@Slf4j -public class IntegralService { - @Autowired - private RedisUtil redisUtil; - @Autowired - private TbOrderInfoMapper orderInfoMapper; - @Autowired - private TbUserInfoMapper userInfoMapper; - @Autowired - private TbProductMapper productMapper; - @Autowired - private TbProductSkuMapper productSkuMapper; - @Autowired - private TbShopInfoMapper shopInfoMapper; - @Autowired - private TbShopUserMapper tbShopUserMapper; - @Resource - private TbReleaseFlowMapper integralFlowMapper; - @Autowired - private TbUserCouponsMapper userCouponsMapper; - @Autowired - private TbSplitAccountsMapper splitAccountsMapper; - - @Transactional(rollbackFor = Exception.class) - public void integralAdd(JSONObject jsonObject) throws ParseException { - String type = jsonObject.getString("type"); - if (type.equals("trade")){ - //优惠券兑换积分 - Integer integralId = jsonObject.getInteger("integralId"); - TbUserCoupons userCoupons = userCouponsMapper.selectByPrimaryKey(integralId); - if (Objects.isNull(userCoupons) || !"0".equals(userCoupons.getStatus())){ - throw new MsgException("优惠券已被使用"); - } - userCoupons.setStatus("trade"); - userCoupons.setUpdateTime(new Date()); - userCouponsMapper.updateByPrimaryKeySelective(userCoupons); - TbParams params = tbShopUserMapper.selectParams(); - TbReleaseFlow integralFlow = new TbReleaseFlow(); - integralFlow.setNum(userCoupons.getCouponsAmount().multiply(params.getTradeRatio())); - integralFlow.setCreateTime(new Date()); - integralFlow.setFromSource(userCoupons.getId()+""); - integralFlow.setType("TRADEADD"); - integralFlow.setUserId(userCoupons.getUserId()); - integralFlowMapper.insert(integralFlow); - TbUserInfo userInfo = userInfoMapper.selectByPrimaryKey(Integer.valueOf(userCoupons.getUserId())); - if (Objects.nonNull(userInfo)){ - userInfo.setTotalScore(userInfo.getTotalScore() + integralFlow.getNum().intValue()); - userInfoMapper.updateByPrimaryKeySelective(userInfo); - } - }else { - Integer orderId = jsonObject.getInteger("orderId"); - TbOrderInfo orderInfo = orderInfoMapper.selectByPrimaryKey(orderId); - if (StringUtils.isNotBlank(orderInfo.getUserCouponId())){ - TbUserCoupons userCoupons = userCouponsMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getUserCouponId())); - if (Objects.nonNull(userCoupons)){ - TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId())); - TbSplitAccounts splitAccounts = new TbSplitAccounts(); - splitAccounts.setConponsAmount(userCoupons.getCouponsAmount()); - splitAccounts.setCreateTime(new Date()); - splitAccounts.setIsSplit("false"); - splitAccounts.setMerchantId(Integer.valueOf(shopInfo.getMerchantId())); - splitAccounts.setShopId(shopInfo.getId()); - splitAccounts.setOrderAmount(orderInfo.getPayAmount()); - splitAccounts.setTradeDay(DateUtils.getDay()); - splitAccounts.setOriginAmount(orderInfo.getOriginAmount()); - splitAccountsMapper.insert(splitAccounts); - } - } - if (Objects.isNull(orderInfo)) { - log.error("该订单不存在"); - return; - } - TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId())); - if (Objects.isNull(shopInfo) || !"true".equals(shopInfo.getIsOpenYhq())){ - log.error("该店铺未开启优惠券功能"); - return; - } - - TbParams params = tbShopUserMapper.selectParams(); - TbUserCoupons userCoupons = new TbUserCoupons(); - userCoupons.setUserId(orderInfo.getUserId()); - userCoupons.setCouponsAmount(orderInfo.getOrderAmount().subtract(orderInfo.getUserCouponAmount()).multiply(params.getIntegralRatio())); - userCoupons.setStatus("0"); - userCoupons.setOrderId(orderId); - userCoupons.setCouponsPrice(userCoupons.getCouponsAmount().multiply(new BigDecimal("0.5"))); - userCoupons.setCreateTime(new Date()); - userCoupons.setEndTime(DateUtils.getNewDate(new Date(),3,30)); - //执行插入方法 - userCouponsMapper.insert(userCoupons); - } - - } - -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index dc4c5ed..1065b2c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -3,40 +3,35 @@ package com.chaozhanggui.system.cashierservice.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chaozhanggui.system.cashierservice.constant.TableConstant; -import com.chaozhanggui.system.cashierservice.dao.*; -import com.chaozhanggui.system.cashierservice.entity.*; -import com.chaozhanggui.system.cashierservice.entity.dto.ShopEatTypeInfoDTO; +import com.chaozhanggui.system.cashierservice.dao.TbOrderDetailMapper; +import com.chaozhanggui.system.cashierservice.dao.TbOrderInfoMapper; +import com.chaozhanggui.system.cashierservice.dao.TbShopInfoMapper; +import com.chaozhanggui.system.cashierservice.dao.TbShopTableMapper; +import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail; +import com.chaozhanggui.system.cashierservice.entity.TbOrderInfo; +import com.chaozhanggui.system.cashierservice.entity.TbShopInfo; +import com.chaozhanggui.system.cashierservice.entity.TbShopTable; import com.chaozhanggui.system.cashierservice.entity.vo.OrderVo; -import com.chaozhanggui.system.cashierservice.exception.MsgException; import com.chaozhanggui.system.cashierservice.mapper.MpCashierCartMapper; import com.chaozhanggui.system.cashierservice.mapper.MpOrderDetailMapper; import com.chaozhanggui.system.cashierservice.mapper.MpOrderInfoMapper; import com.chaozhanggui.system.cashierservice.mapper.MpShopInfoMapper; -import com.chaozhanggui.system.cashierservice.rabbit.RabbitProducer; -import com.chaozhanggui.system.cashierservice.redis.RedisCst; -import com.chaozhanggui.system.cashierservice.redis.RedisUtil; import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; -import com.chaozhanggui.system.cashierservice.util.DateUtils; -import com.chaozhanggui.system.cashierservice.util.N; -import com.chaozhanggui.system.cashierservice.util.RedisUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.io.IOException; import java.math.BigDecimal; -import java.text.ParseException; -import java.util.*; -import java.util.concurrent.TimeUnit; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -46,8 +41,6 @@ import java.util.stream.Collectors; @Service public class OrderService { - @Resource - private RabbitProducer producer; @Resource private TbOrderInfoMapper orderInfoMapper; @@ -57,36 +50,10 @@ public class OrderService { @Resource private TbShopTableMapper shopTableMapper; - @Resource - private TbProductSkuMapper productSkuMapper; - - @Resource - private TbUserInfoMapper userInfoMapper; - @Autowired - private TbWiningUserMapper tbWiningUserMapper; @Resource private TbOrderDetailMapper tbOrderDetailMapper; - @Autowired - private TbReleaseFlowMapper releaseFlowMapper; - @Resource - private TbParamsMapper paramsMapper; - @Resource - private RedisUtil redisUtil; - @Resource - private RedisUtils redisUtils; - @Resource - private TbUserCouponsMapper userCouponsMapper; - @Resource - private TbSystemCouponsMapper systemCouponsMapper; - @Autowired - private TbYhqParamsMapper yhqParamsMapper; - @Autowired - private TbShopUserMapper shopUserMapper; - - @Autowired - private TbOrderInfoMapper tbOrderInfoMapper; @Autowired private MpCashierCartMapper mpCashierCartMapper; @Autowired @@ -280,181 +247,6 @@ public class OrderService { } - @Transactional(rollbackFor = Exception.class) - public Result tradeIntegral(String userId, String id) throws ParseException { - updateIntegral(userId, id); - return Result.success(CodeEnum.ENCRYPT); - } - - private void updateIntegral(String userId, String id) throws ParseException { - - boolean lock_coin = redisUtils.lock(RedisCst.INTEGRAL_COIN_KEY + userId, 5000, TimeUnit.MILLISECONDS); - if (lock_coin) { - TbUserCoupons userCoupons = userCouponsMapper.selectByPrimaryKey(Integer.valueOf(id)); - if (Objects.isNull(userCoupons) || !userCoupons.getStatus().equals("0")) { - throw new MsgException("该优惠券已被使用"); - } - TbParams params = paramsMapper.selectByPrimaryKey(1); - BigDecimal jfAmount = params.getTradeRatio().multiply(userCoupons.getCouponsAmount()); - TbUserInfo tbShopUser = userInfoMapper.selectByPrimaryKey(Integer.valueOf(userId)); - tbShopUser.setTotalScore(tbShopUser.getTotalScore()+jfAmount.intValue()); - userInfoMapper.updateByPrimaryKeySelective(tbShopUser); - userCoupons.setStatus("2"); - userCoupons.setUpdateTime(new Date()); - userCouponsMapper.updateByPrimaryKeySelective(userCoupons); - TbSystemCoupons systemCoupons = new TbSystemCoupons(); - systemCoupons.setEndTime(DateUtils.getNewDate(new Date(),3,30)); - systemCoupons.setCouponsAmount(userCoupons.getCouponsAmount()); - systemCoupons.setCouponsPrice(userCoupons.getCouponsPrice()); - systemCoupons.setStatus("0"); - systemCoupons.setName(userCoupons.getCouponsAmount()+"无门槛优惠券"); - systemCoupons.setCreateTime(new Date()); - String typeName = findName(userCoupons.getCouponsAmount()); - systemCoupons.setTypeName(typeName); - systemCouponsMapper.insert(systemCoupons); - TbReleaseFlow releaseFlow = new TbReleaseFlow(); - releaseFlow.setNum(jfAmount); - releaseFlow.setCreateTime(new Date()); - releaseFlow.setFromSource("OWER"); - releaseFlow.setUserId(userId); - releaseFlow.setOperationType("ADD"); - releaseFlow.setType("EXCHANGEADD"); - releaseFlow.setRemark("兑换增加"); - releaseFlowMapper.insert(releaseFlow); - redisUtils.releaseLock(RedisCst.INTEGRAL_COIN_KEY + userId); - } else { - updateIntegral(userId, id); - } - } - - private String findName(BigDecimal amount) { - List list = yhqParamsMapper.selectAll(); - String typeName = ""; - for (TbYhqParams yhqParams:list){ - if (N.egt(amount,yhqParams.getMinPrice()) && N.gt(yhqParams.getMaxPrice(),amount)){ - typeName = yhqParams.getName(); - break; - } - } - return typeName; - } - - - public Result mineCoupons(String userId, String orderId,String status, Integer page, Integer size) { - BigDecimal amount=null; - if(ObjectUtil.isNotNull(orderId)&&ObjectUtil.isNotEmpty(orderId)){ - TbOrderInfo orderInfo= tbOrderInfoMapper.selectByPrimaryKey(Integer.valueOf(orderId)); - amount=orderInfo.getOriginAmount(); - } - - - PageHelper.startPage(page, size); - List list = userCouponsMapper.selectByUserId(userId,status,amount); - PageInfo pageInfo = new PageInfo(list); - return Result.success(CodeEnum.SUCCESS, pageInfo); - } - - public Result findCoupons(String type, Integer page, Integer size) { - PageHelper.startPage(page, size); - List list = systemCouponsMapper.selectAll(type); - PageInfo pageInfo = new PageInfo(list); - return Result.success(CodeEnum.SUCCESS, pageInfo); - } - - public Result findWiningUser() { - String day = DateUtils.getDay(); - List list = tbWiningUserMapper.selectAllByTrade(day); - return Result.success(CodeEnum.SUCCESS, list); - } - - public Result getYhqPara() { - List list = yhqParamsMapper.selectAll(); - return Result.success(CodeEnum.SUCCESS, list); - } - - public Result testPay(Integer orderId) { - TbOrderInfo orderInfo = orderInfoMapper.selectByPrimaryKey(orderId); - orderInfo.setStatus("closed"); - orderInfo.setPayType("wx_lite"); - orderInfo.setPayOrderNo("test"); - orderInfo.setPayAmount(orderInfo.getOrderAmount()); - orderInfoMapper.updateByPrimaryKeySelective(orderInfo); - JSONObject jsonObject=new JSONObject(); - jsonObject.put("token",0); - jsonObject.put("type","wxcreate"); - jsonObject.put("orderId",orderId.toString()); - producer.putOrderCollect(jsonObject.toJSONString()); - JSONObject coupons = new JSONObject(); - coupons.put("type","buy"); - coupons.put("orderId",orderId); - producer.printCoupons(coupons.toJSONString()); - return Result.success(CodeEnum.SUCCESS); - } - - public Result getYhqDouble(Integer orderId) { - TbUserCoupons userCoupons = userCouponsMapper.selectByOrderId(orderId); - if (Objects.nonNull(userCoupons)){ - TbOrderInfo orderInfo = orderInfoMapper.selectByPrimaryKey(orderId); - userCoupons.setOrderInfo(orderInfo); - } - return Result.success(CodeEnum.SUCCESS,userCoupons); - } - @Transactional(rollbackFor = Exception.class) - public Result yhqDouble(Integer conponsId) { - TbUserCoupons userCoupons = userCouponsMapper.selectByPrimaryKey(conponsId); - if (Objects.isNull(userCoupons) || userCoupons.getIsDouble().equals("true")){ - throw new MsgException("该优惠券翻倍已领取"); - } - modityDouble(conponsId); - return Result.success(CodeEnum.SUCCESS); - } - - - private void modityDouble(Integer conponsId) { - - boolean lock_coin = redisUtils.lock(RedisCst.COUPONS_COIN_KEY + conponsId, 5000, TimeUnit.MILLISECONDS); - if (lock_coin) { - TbUserCoupons userCoupons = userCouponsMapper.selectByPrimaryKey(conponsId); - if (Objects.isNull(userCoupons) || !userCoupons.getStatus().equals("0") || userCoupons.getIsDouble().equals("true")) { - throw new MsgException("该优惠券已翻倍"); - } - TbParams params = shopUserMapper.selectParams(); - userCoupons.setIsDouble("true"); - userCoupons.setCouponsAmount(userCoupons.getCouponsAmount().multiply(params.getTwoRatio())); - userCoupons.setCouponsPrice(userCoupons.getCouponsPrice().multiply(params.getTwoRatio())); - userCoupons.setUpdateTime(new Date()); - userCouponsMapper.updateByPrimaryKeySelective(userCoupons); - redisUtils.releaseLock(RedisCst.COUPONS_COIN_KEY + conponsId); - } else { - modityDouble(conponsId); - } - } - - public Result mineWinner(Integer userId, Integer page, Integer size) { - PageHelper.startPage(page, size); - List list = orderInfoMapper.selectWinnerByUserId(userId); - for (TbOrderInfo tbOrderInfo:list){ - if (StringUtils.isNotEmpty(tbOrderInfo.getWinnnerNo())){ - tbOrderInfo.setIsWinner("true"); - }else { - tbOrderInfo.setIsWinner("false"); - } - } - PageInfo pageInfo = new PageInfo(list); - if (page > pageInfo.getPages()) { - pageInfo.setList(Collections.emptyList()); - } - return Result.success(CodeEnum.SUCCESS, pageInfo); - } - - public Result kc() { - List list = productSkuMapper.selectAll(); - for (TbProductSku productSku:list){ - redisUtil.saveMessage(RedisCst.PRODUCT + productSku.getShopId() + ":" +productSku.getId(),"10000"); - } - return Result.success(CodeEnum.SUCCESS); - } - public Object orderDetail(Integer orderId) { TbOrderInfo orderInfo = mpOrderInfoMapper.selectOne(new LambdaQueryWrapper() diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 9c281b0..fcc0fbe 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1,5 +1,6 @@ package com.chaozhanggui.system.cashierservice.service; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; @@ -82,7 +83,9 @@ public class PayService { @Autowired TbShopPayTypeMapper tbShopPayTypeMapper; @Autowired - private TbActivateProductMapper actProductMapper; + private TbCouponProductMapper couProductMapper; + @Autowired + private TbShopCouponMapper couponMapper; @Resource private TbActivateInRecordMapper activateInRecordMapper; @@ -475,7 +478,6 @@ public class PayService { .eq(TbOrderDetail::getStatus, "unpaid") .set(TbOrderDetail::getStatus, "closed")); - outRecordMapper.updateByOrderIdAndStatus(orderInfo.getId(), "closed"); log.info("更新购物车:{}", cartCount); JSONObject jsonObject = new JSONObject(); @@ -1013,7 +1015,6 @@ public class PayService { //更新子单状态 tbOrderDetailMapper.updateStatusByOrderIdAndStatus(orderInfo.getId(), "closed"); - outRecordMapper.updateByOrderIdAndStatus(orderInfo.getId(), "closed"); //修改主单状态 orderInfo.setStatus("closed"); orderInfo.setPayType("wx_lite"); @@ -1098,7 +1099,6 @@ public class PayService { orderInfo.setPayAmount(orderInfo.getOrderAmount()); orderInfo.setPaidTime(System.currentTimeMillis()); tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); - outRecordMapper.updateByOrderIdAndStatus(orderInfo.getId(), "closed"); JSONObject jsonObject = new JSONObject(); jsonObject.put("token", 0); @@ -1176,8 +1176,18 @@ public class PayService { PageHelper.startPage(page, pageSize); List list = tbActivateMapper.selectByShopId(shopId); for (TbActivate tbActivate : list) { - if (tbActivate.getIsGiftPro() == 1) { - tbActivate.setGives(actProductMapper.queryProsByActivateId(tbActivate.getId())); + if (tbActivate.getIsUseCoupon() == 1) { + TbShopCoupon coupon = couponMapper.queryById(tbActivate.getCouponId()); + if(coupon!=null){ + if(coupon.getType()==1){ + //满减 + tbActivate.setCouponDesc("满"+coupon.getFullAmount() + "减" + coupon.getDiscountAmount()+" * "+tbActivate.getNum()+"张"); + } else if (coupon.getType() == 2) { + //商品 + tbActivate.setCouponDesc("商品券"); + tbActivate.setGives(couProductMapper.queryProsByActivateId(coupon.getId(),tbActivate.getNum())); + } + } } } PageInfo pageInfo = new PageInfo(list); @@ -1292,25 +1302,68 @@ public class PayService { public BigDecimal giveActivate(TbShopUser tbShopUser, BigDecimal memAmount, Integer flowId) { TbActivate activate = tbActivateMapper.selectByAmount(tbShopUser.getShopId(), memAmount); if (ObjectUtil.isNotEmpty(activate) && ObjectUtil.isNotNull(activate)) { - if (activate.getIsGiftPro() != null && activate.getIsGiftPro() == 1) { - List tbActivateProducts = actProductMapper.queryAllByActivateId(activate.getId()); - List actGiveRecords = new ArrayList<>(); - for (TbActivateProduct actPro : tbActivateProducts) { - TbActivateInRecord record = new TbActivateInRecord(Integer.valueOf(tbShopUser.getId()), actPro.getProductId(), actPro.getNum(), Integer.valueOf(tbShopUser.getShopId()), activate.getId(), flowId); - actGiveRecords.add(record); + if (activate.getIsUseCoupon() == 1) { + TbShopCoupon tbShopCoupon = couponMapper.queryById(activate.getCouponId()); + Date start = new Date(); + Date end = new Date(); + if ("fixed".equals(tbShopCoupon.getValidityType())) { + //固定时间 + end = DateUtil.offsetDay(new Date(),tbShopCoupon.getValidDays()); + } else if ("custom".equals(tbShopCoupon.getValidityType())) { + //自定义时间 + start = tbShopCoupon.getValidStartTime(); + end = tbShopCoupon.getValidEndTime(); + } + if (tbShopCoupon != null) { + List actGiveRecords = new ArrayList<>(); + if(tbShopCoupon.getType() == 1) { + //满减 + TbActivateInRecord record = new TbActivateInRecord(); + record.setVipUserId(Integer.valueOf(tbShopUser.getId())); + record.setCouponId(tbShopCoupon.getId()); + record.setName("满" + tbShopCoupon.getFullAmount() + "减" + tbShopCoupon.getDiscountAmount()); + record.setFullAmount(tbShopCoupon.getFullAmount()); + record.setDiscountAmount(tbShopCoupon.getDiscountAmount()); + record.setType(1); + record.setNum(activate.getNum()); + record.setOverNum(activate.getNum()); + record.setShopId(Integer.valueOf(tbShopUser.getShopId())); + record.setSourceActId(activate.getId()); + record.setSourceFlowId(flowId); + record.setUseStartTime(start); + record.setUseEndTime(end); + record.setCouponJson(activateInRecordService.getCouponJson(activate,tbShopCoupon,null)); + actGiveRecords.add(record); + } else if (tbShopCoupon.getType() == 2) { + //商品卷 + List tbCouponProducts = couProductMapper.queryAllByCouponId(tbShopCoupon.getId()); + for (TbCouponProduct actPro : tbCouponProducts) { + TbActivateInRecord record = new TbActivateInRecord(); + record.setVipUserId(Integer.valueOf(tbShopUser.getId())); + record.setCouponId(tbShopCoupon.getId()); + record.setName("商品卷"); + record.setType(2); + record.setProId(actPro.getProductId()); + record.setNum(actPro.getNum()*tbShopCoupon.getNumber()); + record.setOverNum(actPro.getNum()*tbShopCoupon.getNumber()); + record.setShopId(Integer.valueOf(tbShopUser.getShopId())); + record.setSourceActId(activate.getId()); + record.setSourceFlowId(flowId); + record.setUseStartTime(start); + record.setUseEndTime(end); + record.setCouponJson(activateInRecordService.getCouponJson(activate,tbShopCoupon,actPro)); + actGiveRecords.add(record); + } + } + activateInRecordMapper.insertBatch(actGiveRecords); + tbShopCoupon.setLeftNumber(tbShopCoupon.getLeftNumber()-activate.getNum()); + couponMapper.update(tbShopCoupon); } - activateInRecordMapper.insertBatch(actGiveRecords); - } - BigDecimal amount = BigDecimal.ZERO; - switch (activate.getHandselType()) { - case "GD": - amount = activate.getHandselNum(); - break; - case "RATIO": - amount = memAmount.multiply(activate.getHandselNum()); - break; } + BigDecimal amount = activate.getGiftAmount() == null ? + BigDecimal.ZERO : new BigDecimal(activate.getGiftAmount()); + tbShopUser.setAmount(tbShopUser.getAmount().add(amount)); tbShopUser.setUpdatedAt(System.currentTimeMillis()); tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index 13bce08..8164930 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -234,16 +234,6 @@ public class ProductService { } }); groupList.sort(Comparator.comparingInt(TbProductGroup::getIsSale).reversed()); - TbShopUser tbShopUser = tbShopUserMapper.selectByUserIdAndShopId(userId, shopId); - if (tbShopUser != null) { - TbProductGroup vipProGroup = new TbProductGroup(); - vipProGroup.setName("会员商品"); - List vipPros = activateInRecordService.queryByVipIdAndShopId(Integer.valueOf(tbShopUser.getId()), Integer.valueOf(shopId)); - if(!CollectionUtils.isEmpty(vipPros)){ - vipProGroup.setProducts(handleDate(vipPros, true, 1, true)); - groupList.add(0, vipProGroup); - } - } groupList.add(0, hot); concurrentMap.put("productInfo", groupList); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateInRecordService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateInRecordService.java index 01c3a7d..fb12c4a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateInRecordService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateInRecordService.java @@ -1,11 +1,10 @@ package com.chaozhanggui.system.cashierservice.service; -import com.chaozhanggui.system.cashierservice.entity.TbActivateInRecord; -import com.chaozhanggui.system.cashierservice.entity.TbProduct; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; - -import java.util.List; +import com.alibaba.fastjson.JSONObject; +import com.chaozhanggui.system.cashierservice.entity.TbActivate; +import com.chaozhanggui.system.cashierservice.entity.TbCouponProduct; +import com.chaozhanggui.system.cashierservice.entity.TbShopCoupon; +import org.springframework.stereotype.Service; /** * 活动商品赠送表(TbActivateInRecord)表服务接口 @@ -13,44 +12,14 @@ import java.util.List; * @author ww * @since 2024-08-22 11:13:40 */ -public interface TbActivateInRecordService { - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - TbActivateInRecord queryById(Integer id); - - List queryByVipIdAndShopId(Integer vipUserId, Integer shopId); - int queryByVipIdAndShopIdAndProId(Integer vipUserId, Integer shopId,Integer productId); - List queryAllByVipIdAndShopIdAndProId(Integer vipUserId, Integer shopId,Integer productId); - - /** - * 新增数据 - * - * @param tbActivateInRecord 实例对象 - * @return 实例对象 - */ - TbActivateInRecord insert(TbActivateInRecord tbActivateInRecord); - - /** - * 修改数据 - * - * @param tbActivateInRecord 实例对象 - * @return 实例对象 - */ - TbActivateInRecord update(TbActivateInRecord tbActivateInRecord); - - int updateOverNumById(Integer id,Integer overNum); - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 是否成功 - */ - boolean deleteById(Integer id); +@Service +public class TbActivateInRecordService { + public String getCouponJson(TbActivate activate, TbShopCoupon tbShopCoupon, TbCouponProduct couProduct){ + JSONObject result = new JSONObject(); + result.put("activate",JSONObject.toJSON(activate)); + result.put("coupon",JSONObject.toJSON(tbShopCoupon)); + result.put("couProduct",JSONObject.toJSON(couProduct)); + return result.toJSONString(); + } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateOutRecordService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateOutRecordService.java deleted file mode 100644 index e8be3aa..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateOutRecordService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.chaozhanggui.system.cashierservice.service; - -import com.chaozhanggui.system.cashierservice.entity.TbActivateOutRecord; - -/** - * 活动赠送商品使用记录表(TbActivateOutRecord)表服务接口 - * - * @author ww - * @since 2024-08-22 11:21:56 - */ -public interface TbActivateOutRecordService { - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - TbActivateOutRecord queryById(Integer id); - - /** - * 新增数据 - * - * @param tbActivateOutRecord 实例对象 - * @return 实例对象 - */ - TbActivateOutRecord insert(TbActivateOutRecord tbActivateOutRecord); - - /** - * 修改数据 - * - * @param tbActivateOutRecord 实例对象 - * @return 实例对象 - */ - TbActivateOutRecord update(TbActivateOutRecord tbActivateOutRecord); - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 是否成功 - */ - boolean deleteById(Integer id); - -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbShopCouponService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbShopCouponService.java new file mode 100644 index 0000000..aed7e77 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbShopCouponService.java @@ -0,0 +1,15 @@ +package com.chaozhanggui.system.cashierservice.service; + +import com.chaozhanggui.system.cashierservice.entity.dto.CouponDto; +import com.chaozhanggui.system.cashierservice.sign.Result; +import org.springframework.context.annotation.Primary; + +/** + * 优惠券(TbShopCoupon)表服务接口 + * + * @author ww + * @since 2024-10-23 15:37:37 + */ +public interface TbShopCouponService { + Result find(CouponDto param); +} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbUserCouponsService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbUserCouponsService.java deleted file mode 100644 index c687d0a..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbUserCouponsService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.chaozhanggui.system.cashierservice.service; - -import com.chaozhanggui.system.cashierservice.entity.dto.UserCouponDto; -import com.chaozhanggui.system.cashierservice.sign.Result; - -/** - * (TbUserCoupons)表服务接口 - * - * @author ww - * @since 2024-09-02 13:38:20 - */ -public interface TbUserCouponsService { - - /** - * 分页查询 - * - * @param tbUserCoupons 筛选条件 - * @return 查询结果 - */ - Result queryByPage(UserCouponDto tbUserCoupons); - -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java index aac35b7..0240ce0 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java @@ -4,23 +4,18 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.extra.qrcode.QrConfig; -import com.alibaba.fastjson.JSONObject; -import com.chaozhanggui.system.cashierservice.dao.*; -import com.chaozhanggui.system.cashierservice.entity.TbReleaseFlow; +import com.chaozhanggui.system.cashierservice.dao.TbShopInfoMapper; +import com.chaozhanggui.system.cashierservice.dao.TbShopUserMapper; +import com.chaozhanggui.system.cashierservice.dao.TbUserInfoMapper; import com.chaozhanggui.system.cashierservice.entity.TbShopInfo; import com.chaozhanggui.system.cashierservice.entity.TbShopUser; import com.chaozhanggui.system.cashierservice.entity.TbUserInfo; -import com.chaozhanggui.system.cashierservice.entity.vo.IntegralFlowVo; -import com.chaozhanggui.system.cashierservice.entity.vo.IntegralVo; import com.chaozhanggui.system.cashierservice.entity.vo.OpenMemberVo; import com.chaozhanggui.system.cashierservice.exception.MsgException; -import com.chaozhanggui.system.cashierservice.redis.RedisCst; import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; -import com.chaozhanggui.system.cashierservice.util.*; +import com.chaozhanggui.system.cashierservice.util.RedisUtils; import com.chaozhanggui.system.cashierservice.wxUtil.WxAccountUtil; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -35,8 +30,6 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.math.BigDecimal; import java.sql.Timestamp; -import java.util.*; -import java.util.concurrent.TimeUnit; @Service public class UserService { @@ -45,14 +38,8 @@ public class UserService { @Autowired private TbShopUserMapper shopUserMapper; @Autowired - private TbReleaseFlowMapper releaseFlowMapper; - @Autowired private TbUserInfoMapper userInfoMapper; @Autowired - private TbUserCouponsMapper userCouponsMapper; - @Autowired - private TbSystemCouponsMapper systemCouponsMapper; - @Autowired RedisUtils redisUtils; @Qualifier("tbShopInfoMapper") @Autowired @@ -69,192 +56,8 @@ public class UserService { this.resourceLoader = resourceLoader; } - public JSONObject modityIntegral(IntegralVo integralVo, String userSign) { - JSONObject object = (JSONObject) JSONObject.toJSON(integralVo); - if (N.gt(BigDecimal.ZERO, integralVo.getNum())) { - JSONObject result = new JSONObject(); - result.put("status", "fail"); - result.put("msg", "积分数量不允许小于0"); - result.put("data", ""); - return result; - } - object.put("userSign", userSign); - JSONObject jsonObject = JSONUtil.sortJSONObject(object, CacheMap.map); - System.out.println(jsonObject.toJSONString()); - String sign = MD5Util.encrypt(jsonObject.toJSONString()); - if (!sign.equals(integralVo.getSign())) { - JSONObject result = new JSONObject(); - result.put("status", "fail"); - result.put("msg", "签名验证失败"); - result.put("data", ""); - return result; - } - TbShopUser shopUser = shopUserMapper.selectByOpenId(integralVo.getOpenId()); - if (Objects.isNull(shopUser)) { - JSONObject result = new JSONObject(); - result.put("status", "fail"); - result.put("msg", "用户不存在"); - result.put("data", ""); - return result; - } - boolean falg = updateIntegral(shopUser.getUserId(), integralVo.getNum(), integralVo.getType()); - if (!falg) { - JSONObject result = new JSONObject(); - result.put("status", "fail"); - result.put("msg", "余额不足"); - result.put("data", ""); - return result; - } - JSONObject result = new JSONObject(); - result.put("status", "success"); - result.put("msg", "操作成功"); - return result; - } - public static void main(String[] args) { - IntegralVo integralVo = new IntegralVo(); - integralVo.setNum(new BigDecimal("5254")); - integralVo.setOpenId("or1l864NBOoJZhC5x_yeziZ26j6c"); - integralVo.setType("sub"); - JSONObject object = (JSONObject) JSONObject.toJSON(integralVo); - object.put("userSign", "02c03d79c36b4c01b217ffb1baef9009"); - JSONObject jsonObject = JSONUtil.sortJSONObject(object, CacheMap.map); - System.out.println("加密前字符串：" + jsonObject.toJSONString()); - String sign = MD5Util.encrypt(jsonObject.toJSONString()); - System.out.println("加密后签名：" + sign); - } - - private Boolean updateIntegral(String userId, BigDecimal num, String type) { - - boolean lock_coin = redisUtils.lock(RedisCst.INTEGRAL_COIN_KEY + userId, 5000, TimeUnit.MILLISECONDS); - if (lock_coin) { - TbUserInfo tbShopUser = userInfoMapper.selectByPrimaryKey(Integer.valueOf(userId)); - boolean flag = true; - if (type.equals("sub")) { - if (num.intValue() < tbShopUser.getTotalScore()) { - flag = false; - } else { - tbShopUser.setTotalScore(tbShopUser.getTotalScore() - num.intValue()); - } - } else if (type.equals("add")) { - tbShopUser.setTotalScore(tbShopUser.getTotalScore() + num.intValue()); - } - if (flag) { - TbReleaseFlow releaseFlow = new TbReleaseFlow(); - releaseFlow.setNum(num); - releaseFlow.setCreateTime(new Date()); - releaseFlow.setFromSource("OWER"); - releaseFlow.setUserId(userId); - if (type.equals("sub")) { - releaseFlow.setType("BUYSUB"); - releaseFlow.setOperationType("SUB"); - releaseFlow.setRemark("购买商品扣除"); - } else if (type.equals("sub")) { - releaseFlow.setType("THREEADD"); - releaseFlow.setOperationType("ADD"); - releaseFlow.setRemark("退货增加"); - } - releaseFlowMapper.insert(releaseFlow); - userInfoMapper.updateByPrimaryKeySelective(tbShopUser); - } - redisUtils.releaseLock(RedisCst.INTEGRAL_COIN_KEY + userId); - return flag; - } else { - return updateIntegral(userId, num, type); - } - } - - public JSONObject userIntegral(IntegralFlowVo integralFlowVo, String userSign) { - JSONObject object = (JSONObject) JSONObject.toJSON(integralFlowVo); - object.put("userSign", userSign); - JSONObject jsonObject = JSONUtil.sortJSONObject(object, CacheMap.map); - System.out.println(jsonObject.toJSONString()); - String sign = MD5Util.encrypt(jsonObject.toJSONString()); - if (!sign.equals(integralFlowVo.getSign())) { - JSONObject result = new JSONObject(); - result.put("status", "fail"); - result.put("msg", "签名验证失败"); - result.put("data", ""); - return result; - } - TbUserInfo shopUser = userInfoMapper.selectByOpenId(integralFlowVo.getOpenId()); - if (Objects.isNull(shopUser)) { - JSONObject result = new JSONObject(); - result.put("status", "fail"); - result.put("msg", "用户不存在"); - result.put("data", ""); - return result; - } - PageHelper.startPage(integralFlowVo.getPage(), integralFlowVo.getPageSize()); - PageHelper.orderBy("id DESC"); - List list = releaseFlowMapper.selectByUserId(shopUser.getId().toString()); - for (TbReleaseFlow tbReleaseFlow:list){ - tbReleaseFlow.setCreateTr(DateUtils.getStrTime(tbReleaseFlow.getCreateTime())); - } - JSONObject result = new JSONObject(); - result.put("status", "success"); - result.put("msg", "成功"); - result.put("data", list); - return result; - } - - public JSONObject userAllIntegral(IntegralFlowVo integralFlowVo, String userSign) { -// JSONObject object = (JSONObject) JSONObject.toJSON(integralFlowVo); -// object.put("userSign", userSign); -// JSONObject jsonObject = JSONUtil.sortJSONObject(object, CacheMap.notOpenMap); -// System.out.println(jsonObject.toJSONString()); -// String sign = MD5Util.encrypt(jsonObject.toJSONString()); -// if (!sign.equals(integralFlowVo.getSign())) { -// JSONObject result = new JSONObject(); -// result.put("status", "fail"); -// result.put("msg", "签名验证失败"); -// result.put("data", ""); -// return result; -// } - PageHelper.startPage(integralFlowVo.getPage(), integralFlowVo.getPageSize()); - PageHelper.orderBy("id DESC"); - List list = releaseFlowMapper.selectAll(); - for (TbReleaseFlow tbReleaseFlow:list){ - tbReleaseFlow.setCreateTr(DateUtils.getStrTime(tbReleaseFlow.getCreateTime())); - } - PageInfo pageInfo = new PageInfo(list); - JSONObject result = new JSONObject(); - result.put("status", "success"); - result.put("msg", "成功"); - result.put("data", pageInfo); - return result; - } - - public JSONObject userAll(IntegralFlowVo integralFlowVo, String userSign) { -// JSONObject object = (JSONObject) JSONObject.toJSON(integralFlowVo); -// object.put("userSign", userSign); -// JSONObject jsonObject = JSONUtil.sortJSONObject(object, CacheMap.notOpenMap); -// System.out.println(jsonObject.toJSONString()); -// String sign = MD5Util.encrypt(jsonObject.toJSONString()); -// if (!sign.equals(integralFlowVo.getSign())) { -// JSONObject result = new JSONObject(); -// result.put("status", "fail"); -// result.put("msg", "签名验证失败"); -// result.put("data", ""); -// return result; -// } - PageHelper.startPage(integralFlowVo.getPage(), integralFlowVo.getPageSize()); - PageHelper.orderBy("id DESC"); - List list = userInfoMapper.selectAll(); - PageInfo pageInfo = new PageInfo(list); - JSONObject result = new JSONObject(); - result.put("status", "success"); - result.put("msg", "成功"); - result.put("data", pageInfo); - return result; - } - - public int userCoupon(String userId, BigDecimal orderNum) { - int userNum = userCouponsMapper.selectByUserIdAndAmount(userId,orderNum); - int sysNum = systemCouponsMapper.selectByAmount(orderNum); - return userNum+sysNum; - } public String getSubQrCode(String shopId) throws Exception { TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(shopId)); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java deleted file mode 100644 index a3cb707..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.chaozhanggui.system.cashierservice.service.impl; - -import com.chaozhanggui.system.cashierservice.dao.TbActivateInRecordMapper; -import com.chaozhanggui.system.cashierservice.entity.TbActivateInRecord; -import com.chaozhanggui.system.cashierservice.entity.TbProduct; -import com.chaozhanggui.system.cashierservice.service.TbActivateInRecordService; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 活动商品赠送表(TbActivateInRecord)表服务实现类 - * - * @author ww - * @since 2024-08-22 11:13:40 - */ -@Service -@Primary -public class TbActivateInRecordServiceImpl implements TbActivateInRecordService { - @Resource - private TbActivateInRecordMapper tbActivateInRecordMapper; - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - @Override - public TbActivateInRecord queryById(Integer id) { - return this.tbActivateInRecordMapper.queryById(id); - } - - @Override - public List queryByVipIdAndShopId(Integer vipUserId, Integer shopId) { - return tbActivateInRecordMapper.queryByVipIdAndShopId(vipUserId, shopId); - } - - @Override - public int queryByVipIdAndShopIdAndProId(Integer vipUserId, Integer shopId,Integer productId){ - return tbActivateInRecordMapper.queryByVipIdAndShopIdAndProId(vipUserId,shopId,productId); - } - - @Override - public List queryAllByVipIdAndShopIdAndProId(Integer vipUserId, Integer shopId,Integer productId){ - return tbActivateInRecordMapper.queryAllByVipIdAndShopIdAndProId(vipUserId,shopId,productId); - } - - - /** - * 新增数据 - * - * @param tbActivateInRecord 实例对象 - * @return 实例对象 - */ - @Override - public TbActivateInRecord insert(TbActivateInRecord tbActivateInRecord) { - this.tbActivateInRecordMapper.insert(tbActivateInRecord); - return tbActivateInRecord; - } - - /** - * 修改数据 - * - * @param tbActivateInRecord 实例对象 - * @return 实例对象 - */ - @Override - public TbActivateInRecord update(TbActivateInRecord tbActivateInRecord) { - this.tbActivateInRecordMapper.update(tbActivateInRecord); - return this.queryById(tbActivateInRecord.getId()); - } - - @Override - public int updateOverNumById(Integer id,Integer overNum){ - return tbActivateInRecordMapper.updateOverNumById(id,overNum); - } - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 是否成功 - */ - @Override - public boolean deleteById(Integer id) { - return this.tbActivateInRecordMapper.deleteById(id) > 0; - } -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateOutRecordServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateOutRecordServiceImpl.java deleted file mode 100644 index 493603d..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateOutRecordServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.chaozhanggui.system.cashierservice.service.impl; - -import com.chaozhanggui.system.cashierservice.entity.TbActivateOutRecord; -import com.chaozhanggui.system.cashierservice.dao.TbActivateOutRecordMapper; -import com.chaozhanggui.system.cashierservice.service.TbActivateOutRecordService; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * 活动赠送商品使用记录表(TbActivateOutRecord)表服务实现类 - * - * @author ww - * @since 2024-08-22 11:21:56 - */ -@Service -@Primary -public class TbActivateOutRecordServiceImpl implements TbActivateOutRecordService { - @Resource - private TbActivateOutRecordMapper tbActivateOutRecordMapper; - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - @Override - public TbActivateOutRecord queryById(Integer id) { - return this.tbActivateOutRecordMapper.queryById(id); - } - - /** - * 新增数据 - * - * @param tbActivateOutRecord 实例对象 - * @return 实例对象 - */ - @Override - public TbActivateOutRecord insert(TbActivateOutRecord tbActivateOutRecord) { - this.tbActivateOutRecordMapper.insert(tbActivateOutRecord); - return tbActivateOutRecord; - } - - /** - * 修改数据 - * - * @param tbActivateOutRecord 实例对象 - * @return 实例对象 - */ - @Override - public TbActivateOutRecord update(TbActivateOutRecord tbActivateOutRecord) { - this.tbActivateOutRecordMapper.update(tbActivateOutRecord); - return this.queryById(tbActivateOutRecord.getId()); - } - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 是否成功 - */ - @Override - public boolean deleteById(Integer id) { - return this.tbActivateOutRecordMapper.deleteById(id) > 0; - } -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateProductServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateProductServiceImpl.java deleted file mode 100644 index 66e033e..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateProductServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.chaozhanggui.system.cashierservice.service.impl; - - -import com.chaozhanggui.system.cashierservice.dao.TbActivateProductMapper; -import com.chaozhanggui.system.cashierservice.entity.TbActivateProduct; -import com.chaozhanggui.system.cashierservice.service.TbActivateProductService; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * 活动赠送商品表(TbActivateProduct)表服务实现类 - * - * @author ww - * @since 2024-08-20 15:15:02 - */ -@Service -@Primary -public class TbActivateProductServiceImpl implements TbActivateProductService { - @Resource - private TbActivateProductMapper tbActivateProductMapper; - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - @Override - public TbActivateProduct queryById(Integer id) { - return this.tbActivateProductMapper.queryById(id); - } - - /** - * 新增数据 - * - * @param tbActivateProduct 实例对象 - * @return 实例对象 - */ - @Override - public TbActivateProduct insert(TbActivateProduct tbActivateProduct) { - this.tbActivateProductMapper.insert(tbActivateProduct); - return tbActivateProduct; - } - - /** - * 修改数据 - * - * @param tbActivateProduct 实例对象 - * @return 实例对象 - */ - @Override - public TbActivateProduct update(TbActivateProduct tbActivateProduct) { - this.tbActivateProductMapper.update(tbActivateProduct); - return this.queryById(tbActivateProduct.getId()); - } - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 是否成功 - */ - @Override - public boolean deleteById(Integer id) { - return this.tbActivateProductMapper.deleteById(id) > 0; - } -} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java new file mode 100644 index 0000000..7075f61 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java @@ -0,0 +1,128 @@ +package com.chaozhanggui.system.cashierservice.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import com.chaozhanggui.system.cashierservice.dao.*; +import com.chaozhanggui.system.cashierservice.entity.*; +import com.chaozhanggui.system.cashierservice.entity.dto.CouponDto; +import com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo; +import com.chaozhanggui.system.cashierservice.service.TbShopCouponService; +import com.chaozhanggui.system.cashierservice.sign.CodeEnum; +import com.chaozhanggui.system.cashierservice.sign.Result; +import com.google.gson.JsonObject; +import org.apache.commons.lang3.StringUtils; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 优惠券(TbShopCoupon)表服务实现类 + * + * @author ww + * @since 2024-10-23 15:37:37 + */ +@Primary +@Service +public class TbShopCouponServiceImpl implements TbShopCouponService { + @Resource + private TbOrderDetailMapper orderDetailMapper; + @Resource + private TbShopUserMapper shopUserMapper; + @Resource + private TbShopCouponMapper couponMapper; + @Resource + private TbOrderInfoMapper orderInfoMapper; + @Resource + private TbActivateInRecordMapper inRecordMapper; + @Resource + private TbActivateOutRecordMapper outRecordMapper; + + @Override + public Result find(CouponDto param) { + TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(param.getUserId().toString(), param.getShopId().toString()); + if (param.getOrderId() != null) { + TbOrderInfo tbOrderInfo = orderInfoMapper.selectByPrimaryKey(param.getOrderId()); + List tbOrderDetails = orderDetailMapper.selectAllByOrderId(param.getOrderId()); + Set pros = tbOrderDetails.stream().map(TbOrderDetail::getProductId).collect(Collectors.toSet()); + if (CollectionUtil.isNotEmpty(tbOrderDetails)) { + List tbUserCouponVos = inRecordMapper.queryByVipIdAndShopId(Integer.valueOf(tbShopUser.getId()), param.getShopId()); + if (CollectionUtil.isNotEmpty(tbUserCouponVos)) { + String week = DateUtil.dayOfWeekEnum(new Date()).toChinese("周"); + LocalTime now = LocalTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); + + //券id 券使用描述 + Map coupons = new HashMap<>(); + for (TbUserCouponVo tbUserCouponVo : tbUserCouponVos) { + if (!coupons.containsKey(tbUserCouponVo.getCouponId())) { + JsonObject json=new JsonObject(); + boolean isUse = true; + TbShopCoupon tbShopCoupon = couponMapper.queryById(tbUserCouponVo.getCouponId()); + StringBuilder useRestrictions = new StringBuilder("每天 "); + if(tbShopCoupon.getType().equals(1)){ + if(tbOrderInfo.getOrderAmount().compareTo(new BigDecimal(tbShopCoupon.getFullAmount()))<0){ + isUse=false; + } + } + if(StringUtils.isNotBlank(tbShopCoupon.getUserDays())){ + String[] split = tbShopCoupon.getUserDays().split(","); + if (split.length != 7) { + useRestrictions = new StringBuilder(tbShopCoupon.getUserDays() + " "); + } + if(!tbShopCoupon.getUserDays().contains(week)){ + isUse=false; + } + } + if (tbShopCoupon.getUseTimeType().equals("custom")) { + if(now.isBefore(tbShopCoupon.getUseStartTime()) || now.isAfter(tbShopCoupon.getUseEndTime())){ + isUse=false; + } + useRestrictions.append( + tbShopCoupon.getUseStartTime().format(formatter) + + "-" + + tbShopCoupon.getUseEndTime().format(formatter)); + } else { + useRestrictions.append("全时段"); + } + useRestrictions.append(" 可用"); + json.addProperty("isUse",isUse); + json.addProperty("useRestrictions",useRestrictions.toString()); + + coupons.put(tbUserCouponVo.getCouponId(), json); + } + JsonObject couponJson = coupons.get(tbUserCouponVo.getCouponId()); + tbUserCouponVo.setUseRestrictions(couponJson.get("useRestrictions").toString()); + if(tbUserCouponVo.getType().equals(1)){ + tbUserCouponVo.setUse(couponJson.get("isUse").getAsBoolean()); + } else if (tbUserCouponVo.getType().equals(2) && couponJson.get("isUse").getAsBoolean()) { + if(!pros.contains(tbUserCouponVo.getProId())){ + tbUserCouponVo.setUse(false); + } + } + } + tbUserCouponVos.sort(Comparator.comparing(TbUserCouponVo::isUse).reversed().thenComparing(TbUserCouponVo::getExpireTime)); + return new Result(CodeEnum.SUCCESS, tbUserCouponVos); + } + } + } else { + if (param.getStatus().equals(1)) { + return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopId(Integer.valueOf(tbShopUser.getId()), param.getShopId())); + } else if (param.getStatus().equals(-1)) { + return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopIdExpire(Integer.valueOf(tbShopUser.getId()), param.getShopId())); + } else if (param.getStatus().equals(2)) { + return new Result(CodeEnum.SUCCESS, outRecordMapper.queryByVipIdAndShopId(Integer.valueOf(tbShopUser.getId()), param.getShopId())); + } + } + return new Result(CodeEnum.SUCCESS); + } + +} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java deleted file mode 100644 index 5236c6c..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.chaozhanggui.system.cashierservice.service.impl; - -import com.chaozhanggui.system.cashierservice.dao.*; -import com.chaozhanggui.system.cashierservice.entity.TbShopInfo; -import com.chaozhanggui.system.cashierservice.entity.dto.UserCouponDto; -import com.chaozhanggui.system.cashierservice.entity.vo.ShopUserListVo; -import com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo; -import com.chaozhanggui.system.cashierservice.service.TbUserCouponsService; -import com.chaozhanggui.system.cashierservice.sign.CodeEnum; -import com.chaozhanggui.system.cashierservice.sign.Result; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * (TbUserCoupons)表服务实现类 - * - * @author ww - * @since 2024-09-02 13:38:20 - */ -@Primary -@Service -public class TbUserCouponsServiceImpl implements TbUserCouponsService { - @Resource - private TbUserCouponsMapper tbUserCouponsMapper; - @Resource - private TbActivateInRecordMapper inRecordMapper; - @Resource - private TbActivateOutRecordMapper outRecordMapper; - @Autowired - private TbShopUserMapper tbShopUserMapper; - @Autowired - private TbShopInfoMapper tbShopInfoMapper; - - - /** - * 分页查询 - * @return 查询结果 - */ - @Override - public Result queryByPage(UserCouponDto couponDto) { -// PageHelper.startPage(couponDto.getPage(), couponDto.getSize()); -// List result = tbUserCouponsMapper.queryAllSelective(couponDto); -// return new Result(CodeEnum.SUCCESS, new PageInfo<>(result)); -// List result = tbUserCouponsMapper.queryAllSelective(couponDto); - List result = new ArrayList<>(); - List tbShopUsers = tbShopUserMapper.selectByUserId(couponDto.getUserId().toString(), couponDto.getShopId()==null?null:couponDto.getShopId().toString()); - if (!CollectionUtils.isEmpty(tbShopUsers)) { - tbShopUsers.forEach(s -> { - TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(s.getShopId().intValue()); - if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 0)) { - List unuseCoupon = inRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue(),shopInfo.getShopName()); - result.addAll(unuseCoupon); - } - if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 1)) { - List useCoupon = outRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue(),shopInfo.getShopName()); - result.addAll(useCoupon); - } - }); - } - - return new Result(CodeEnum.SUCCESS, result); - } - -} - diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/task/TaskScheduler.java b/src/main/java/com/chaozhanggui/system/cashierservice/task/TaskScheduler.java index 4aa7ea9..b67ce3c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/task/TaskScheduler.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/task/TaskScheduler.java @@ -1,178 +1,22 @@ package com.chaozhanggui.system.cashierservice.task; -import com.chaozhanggui.system.cashierservice.dao.*; -import com.chaozhanggui.system.cashierservice.entity.*; import com.chaozhanggui.system.cashierservice.service.TbShopSongOrderService; -import com.chaozhanggui.system.cashierservice.util.DateUtils; -import com.chaozhanggui.system.cashierservice.util.NicknameGenerator; -import com.chaozhanggui.system.cashierservice.util.RandomUtil; -import lombok.SneakyThrows; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.ParseException; -import java.util.*; -import java.util.concurrent.*; - @Component public class TaskScheduler { private static final Logger log = LoggerFactory.getLogger(TaskScheduler.class); - @Autowired - private TbWiningUserMapper tbWiningUserMapper; - @Autowired - private TbOrderInfoMapper orderInfoMapper; - @Autowired - private TbWiningParamsMapper winingParamsMapper; - @Autowired - private TbUserInfoMapper userInfoMapper; - @Autowired - private TbReleaseFlowMapper releaseFlowMapper; - @Autowired - private TbUserCouponsMapper userCouponsMapper; - private final TbShopSongOrderService shopSongOrderService; public TaskScheduler(@Qualifier("tbShopSongOrderServiceImpl") TbShopSongOrderService shopSongOrderService) { this.shopSongOrderService = shopSongOrderService; } - //更新订单状态 -// @Scheduled(fixedRate = 1000000) - public void orderStatus() throws InterruptedException { - for (int i = 0;i<10;i++){ - TbReleaseFlow releaseFlow = new TbReleaseFlow(); - BigDecimal orderAmount = RandomUtil.getRandomBigDecimal(BigDecimal.ONE, new BigDecimal("100")); - releaseFlow.setNum(orderAmount); - releaseFlow.setCreateTime(new Date()); - releaseFlow.setFromSource("OWER"); - releaseFlow.setUserId("15"); - releaseFlow.setOperationType("ADD"); - releaseFlow.setType("EXCHANGEADD"); - releaseFlow.setRemark("兑换增加"); - releaseFlowMapper.insert(releaseFlow); - } - for (int i = 0;i<10;i++){ - TbReleaseFlow releaseFlow = new TbReleaseFlow(); - BigDecimal orderAmount = RandomUtil.getRandomBigDecimal(BigDecimal.ONE, new BigDecimal("100")); - releaseFlow.setNum(orderAmount); - releaseFlow.setCreateTime(new Date()); - releaseFlow.setFromSource("OWER"); - releaseFlow.setUserId("15"); - releaseFlow.setOperationType("SUB"); - releaseFlow.setType("BUYSUB"); - releaseFlow.setRemark("购买商品扣除"); - releaseFlowMapper.insert(releaseFlow); - } - for (int i = 0;i<10;i++){ - TbReleaseFlow releaseFlow = new TbReleaseFlow(); - BigDecimal orderAmount = RandomUtil.getRandomBigDecimal(BigDecimal.ONE, new BigDecimal("100")); - releaseFlow.setNum(orderAmount); - releaseFlow.setCreateTime(new Date()); - releaseFlow.setFromSource("OWER"); - releaseFlow.setOperationType("ADD"); - releaseFlow.setUserId("15"); - releaseFlow.setType("THREEADD"); - releaseFlow.setRemark("退货增加"); - releaseFlowMapper.insert(releaseFlow); - } - } - - - @Scheduled(cron = "0 1 0 * * ?") - public void winningUser() { - String day = DateUtils.getDay(); - List list = winingParamsMapper.selectAll(); - ThreadPoolExecutor es = new ThreadPoolExecutor(5, 10, 60L, TimeUnit.SECONDS, - new LinkedBlockingQueue(), new ThreadFactory() { - @Override - public Thread newThread(Runnable r) { - Thread t = new Thread(r); - t.setDaemon(true); - return t; - } - }); - for (TbWiningParams winingParams : list) { - es.submit(new winingUser(winingParams, day)); - } - es.shutdown(); - - } - - class winingUser implements Runnable { - private TbWiningParams winingParams; - private String day; - - public winingUser(TbWiningParams winingParams, String day) { - this.winingParams = winingParams; - this.day = day; - } - - @Override - public void run() { - try { - List list = orderInfoMapper.selectByTradeDay(day, winingParams.getMinPrice(), winingParams.getMaxPrice()); - int num = winingParams.getWiningUserNum(); - List newList = new ArrayList<>(); - Map map = new HashMap<>(); - int noUserNum = winingParams.getWiningNum() - num; - if (list.size() < num) { - noUserNum = winingParams.getWiningNum(); - } else { - for (int i = 0; i < num; i++) { - TbOrderInfo orderInfo = RandomUtil.selectWinner(list, map); - newList.add(orderInfo); - map.put(orderInfo.getId(), 1); - } - } - for (int i = 0; i < noUserNum; i++) { - long endDate = DateUtils.convertDate1(day + " 00:00:00").getTime(); - long startDate = DateUtils.convertDate1(DateUtils.getSdfDayTimes(DateUtils.getNewDate(new Date(), 3, -1))+" 00:00:00").getTime(); - String orderNo = generateOrderNumber(startDate, endDate); - String userName = NicknameGenerator.generateRandomWeChatNickname(); - BigDecimal orderAmount = RandomUtil.getRandomBigDecimal(winingParams.getMinPrice(), winingParams.getMaxPrice()); - TbWiningUser winingUser = new TbWiningUser(userName, orderNo, orderAmount, "false", day); - tbWiningUserMapper.insert(winingUser); - } - for (TbOrderInfo orderInfo:newList){ - TbUserInfo userInfo = userInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getUserId())); - TbWiningUser winingUser = new TbWiningUser(userInfo.getNickName(), orderInfo.getOrderNo(), orderInfo.getPayAmount(), "true", day); - tbWiningUserMapper.insert(winingUser); - TbUserCoupons userCoupons = new TbUserCoupons(); - userCoupons.setUserId(orderInfo.getUserId()); - userCoupons.setCouponsAmount(orderInfo.getOrderAmount().subtract(orderInfo.getUserCouponAmount())); - userCoupons.setStatus("0"); - userCoupons.setOrderId(orderInfo.getId()); - userCoupons.setCouponsPrice(userCoupons.getCouponsAmount().multiply(new BigDecimal("0.5"))); - userCoupons.setCreateTime(new Date()); - userCoupons.setEndTime(DateUtils.getNewDate(new Date(),3,30)); - //执行插入方法 - userCouponsMapper.insert(userCoupons); - } - } catch (ParseException e) { - e.printStackTrace(); - } - } - } - - public String generateOrderNumber(long startTimestamp, long endTimestamp) { - long date = getRandomTimestamp(startTimestamp, endTimestamp); - Random random = new Random(); - int randomNum = random.nextInt(900) + 100; - return "WX" + date + randomNum; - } - - public static long getRandomTimestamp(long startTimestamp, long endTimestamp) { - long randomMilliseconds = ThreadLocalRandom.current().nextLong(startTimestamp, endTimestamp); - return randomMilliseconds; - } - @Scheduled(fixedRate = 60000 * 60) public void clearSongOrder() { log.info("定时任务执行，清楚过期歌曲订单"); diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml index 4c9f5e1..ed6befc 100644 --- a/src/main/resources/mapper/TbActivateInRecordMapper.xml +++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml @@ -5,29 +5,97 @@ + + + + + + + + - - id - , vip_user_id, pro_id, num, over_num, shop_id, source_act_id, source_flow_id, create_time, update_time + +id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, coupon_json + + + + + + - - - - - - - - - insert into tb_activate_in_record(vip_user_id, pro_id, num, over_num, shop_id, source_act_id, source_flow_id, - create_time, update_time) - values (#{vipUserId}, #{proId}, #{num}, #{overNum}, #{shopId}, #{sourceActId}, #{sourceFlowId}, #{createTime}, - #{updateTime}) + insert into tb_activate_in_record(vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, coupon_json) + values (#{vipUserId}, #{couponId}, #{name}, #{type}, #{proId}, #{fullAmount}, #{discountAmount}, #{num}, #{overNum}, #{shopId}, #{sourceActId}, #{sourceFlowId}, #{useStartTime}, #{useEndTime}, #{createTime}, #{updateTime}, #{couponJson}) - insert into tb_activate_in_record(vip_user_id, pro_id, num, over_num, shop_id, source_act_id, source_flow_id, - create_time, update_time) + insert into tb_activate_in_record(vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, coupon_json) values - (#{entity.vipUserId}, #{entity.proId}, #{entity.num}, #{entity.overNum}, #{entity.shopId}, - #{entity.sourceActId}, #{entity.sourceFlowId}, #{entity.createTime}, #{entity.updateTime}) + (#{entity.vipUserId}, #{entity.couponId}, #{entity.name}, #{entity.type}, #{entity.proId}, #{entity.fullAmount}, #{entity.discountAmount}, #{entity.num}, #{entity.overNum}, #{entity.shopId}, #{entity.sourceActId}, #{entity.sourceFlowId}, #{entity.useStartTime}, #{entity.useEndTime}, #{entity.createTime}, #{entity.updateTime}, #{entity.couponJson}) @@ -153,9 +191,24 @@ vip_user_id = #{vipUserId}, + + coupon_id = #{couponId}, + + + name = #{name}, + + + type = #{type}, + pro_id = #{proId}, + + full_amount = #{fullAmount}, + + + discount_amount = #{discountAmount}, + num = #{num}, @@ -171,28 +224,28 @@ source_flow_id = #{sourceFlowId}, + + use_start_time = #{useStartTime}, + + + use_end_time = #{useEndTime}, + create_time = #{createTime}, update_time = #{updateTime}, + + coupon_json = #{couponJson}, + where id = #{id} - - update tb_activate_in_record - set - over_num = #{overNum} - where id = #{id}; - - - delete - from tb_activate_in_record - where id = #{id} + delete from tb_activate_in_record where id = #{id} diff --git a/src/main/resources/mapper/TbActivateMapper.xml b/src/main/resources/mapper/TbActivateMapper.xml index 8eb2307..bddebc8 100644 --- a/src/main/resources/mapper/TbActivateMapper.xml +++ b/src/main/resources/mapper/TbActivateMapper.xml @@ -1,132 +1,143 @@ - - - - - - - - - - - - id, shop_id, min_num, max_num, handsel_num, handsel_type, is_del,is_gift_pro - - - - delete from tb_activate - where id = #{id,jdbcType=INTEGER} - - - insert into tb_activate (id, shop_id, min_num, - max_num, handsel_num, handsel_type, - is_del) - values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, #{minNum,jdbcType=INTEGER}, - #{maxNum,jdbcType=INTEGER}, #{handselNum,jdbcType=DECIMAL}, #{handselType,jdbcType=VARCHAR}, - #{isDel,jdbcType=VARCHAR}) - - - insert into tb_activate - - - id, - - - shop_id, - - - min_num, - - - max_num, - - - handsel_num, - - - handsel_type, - - - is_del, - - - - - #{id,jdbcType=INTEGER}, - - - #{shopId,jdbcType=INTEGER}, - - - #{minNum,jdbcType=INTEGER}, - - - #{maxNum,jdbcType=INTEGER}, - - - #{handselNum,jdbcType=DECIMAL}, - - - #{handselType,jdbcType=VARCHAR}, - - - #{isDel,jdbcType=VARCHAR}, - - - - - update tb_activate - - - shop_id = #{shopId,jdbcType=INTEGER}, - - - min_num = #{minNum,jdbcType=INTEGER}, - - - max_num = #{maxNum,jdbcType=INTEGER}, - - - handsel_num = #{handselNum,jdbcType=DECIMAL}, - - - handsel_type = #{handselType,jdbcType=VARCHAR}, - - - is_del = #{isDel,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_activate - set shop_id = #{shopId,jdbcType=INTEGER}, - min_num = #{minNum,jdbcType=INTEGER}, - max_num = #{maxNum,jdbcType=INTEGER}, - handsel_num = #{handselNum,jdbcType=DECIMAL}, - handsel_type = #{handselType,jdbcType=VARCHAR}, - is_del = #{isDel,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - + + + + + + + + + + + + + + id + , shop_id, amount, gift_amount, is_use_coupon, coupon_id, num, create_time, update_time + + + + + + + + + + + + + + + + insert into tb_activate(shop_id, amount, gift_amount, is_use_coupon, coupon_id, num, create_time, update_time) + values (#{shopId}, #{amount}, #{giftAmount}, #{isUseCoupon}, #{couponId}, #{num}, #{createTime}, #{updateTime}) + + + + insert into tb_activate(shop_id, amount, gift_amount, is_use_coupon, coupon_id, num, create_time, update_time) + values + + (#{entity.shopId}, #{entity.amount}, #{entity.giftAmount}, #{entity.isUseCoupon}, #{entity.couponId}, + #{entity.num}, #{entity.createTime}, #{entity.updateTime}) + + + + + + update tb_activate + + + shop_id = #{shopId}, + + + amount = #{amount}, + + + gift_amount = #{giftAmount}, + + + is_use_coupon = #{isUseCoupon}, + + + coupon_id = #{couponId}, + + + num = #{num}, + + + create_time = #{createTime}, + + + update_time = #{updateTime}, + + + where id = #{id} + + + + + delete + from tb_activate + where id = #{id} + + + - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbActivateOutRecordMapper.xml b/src/main/resources/mapper/TbActivateOutRecordMapper.xml index 9f053b4..86b536d 100644 --- a/src/main/resources/mapper/TbActivateOutRecordMapper.xml +++ b/src/main/resources/mapper/TbActivateOutRecordMapper.xml @@ -4,11 +4,13 @@ + + - + + - @@ -16,7 +18,7 @@ id - , give_id, pro_id, use_num, ref_num, order_id,status, create_time, update_time + , shop_id, order_id, give_id, vip_user_id, type, use_num, ref_num, status, create_time, update_time - - + SELECT + CASE + WHEN outRecord.type = 1 THEN inRecord.name + WHEN outRecord.type = 2 THEN pro.NAME + END AS `name`, + outRecord.type, + outRecord.use_num-outRecord.ref_num as num + FROM + tb_activate_out_record outRecord + INNER JOIN tb_activate_in_record inRecord + on outRecord.give_id = inRecord.id + and inRecord.shop_id = #{shopId} + and inRecord.vip_user_id = #{vipUserId} + LEFT JOIN tb_product pro + ON inRecord.pro_id = pro.id and pro.shop_id = #{shopId} + WHERE + outRecord.vip_user_id = #{vipUserId} + and outRecord.shop_id = #{shopId} + and outRecord.status = 'closed' + and outRecord.use_num-outRecord.ref_num >0 + order by outRecord.create_time desc @@ -57,11 +63,20 @@ and id = #{id} + + and shop_id = #{shopId} + + + and order_id = #{orderId} + and give_id = #{giveId} - - and pro_id = #{proId} + + and vip_user_id = #{vipUserId} + + + and type = #{type} and use_num = #{useNum} @@ -69,9 +84,6 @@ and ref_num = #{refNum} - - and order_id = #{orderId} - and status = #{status} @@ -87,16 +99,19 @@ - insert into tb_activate_out_record(give_id, pro_id, use_num, ref_num, order_id, status, create_time, update_time) - values (#{giveId}, #{proId}, #{useNum}, #{refNum}, #{orderId}, #{status} #{createTime}, #{updateTime}) + insert into tb_activate_out_record(shop_id, order_id, give_id, vip_user_id, type, use_num, ref_num, status, + create_time, update_time) + values (#{shopId}, #{orderId}, #{giveId}, #{vipUserId}, #{type}, #{useNum}, #{refNum}, #{status}, #{createTime}, + #{updateTime}) - insert into tb_activate_out_record(give_id, pro_id, use_num, ref_num, order_id, status, create_time, update_time) + insert into tb_activate_out_record(shop_id, order_id, give_id, vip_user_id, type, use_num, ref_num, status, + create_time, update_time) values - (#{entity.giveId}, #{entity.proId}, #{entity.useNum}, #{entity.refNum}, #{entity.orderId}, - #{entity.status}, #{entity.createTime}, #{entity.updateTime}) + (#{entity.shopId}, #{entity.orderId}, #{entity.giveId}, #{entity.vipUserId}, #{entity.type}, + #{entity.useNum}, #{entity.refNum}, #{entity.status}, #{entity.createTime}, #{entity.updateTime}) @@ -104,11 +119,20 @@ update tb_activate_out_record + + shop_id = #{shopId}, + + + order_id = #{orderId}, + give_id = #{giveId}, - - pro_id = #{proId}, + + vip_user_id = #{vipUserId}, + + + type = #{type}, use_num = #{useNum}, @@ -116,9 +140,6 @@ ref_num = #{refNum}, - - order_id = #{orderId}, - status = #{status}, @@ -131,13 +152,6 @@ where id = #{id} - - update tb_activate_out_record - set - status = 'closed' - where order_id = #{orderId} - - diff --git a/src/main/resources/mapper/TbActivateProductMapper.xml b/src/main/resources/mapper/TbCouponProductMapper.xml similarity index 60% rename from src/main/resources/mapper/TbActivateProductMapper.xml rename to src/main/resources/mapper/TbCouponProductMapper.xml index 2f59325..251e1b6 100644 --- a/src/main/resources/mapper/TbActivateProductMapper.xml +++ b/src/main/resources/mapper/TbCouponProductMapper.xml @@ -1,39 +1,41 @@ - - + + + - + - -id, activate_id, product_id, num, create_time, update_time + + id + , coupon_id, product_id, num, create_time, update_time - select - + - from tb_activate_product + from tb_coupon_product where id = #{id} - select - + - from tb_activate_product + from tb_coupon_product and id = #{id} - - and activate_id = #{activateId} + + and coupon_id = #{couponId} and product_id = #{productId} @@ -50,43 +52,42 @@ id, activate_id, product_id, num, create_time, update_time - select - from tb_activate_product + from tb_coupon_product where - activate_id = #{activateId} + coupon_id = #{couponId} - - insert into tb_activate_product(activate_id, product_id, num, create_time, update_time) - values (#{activateId}, #{productId}, #{num}, #{createTime}, #{updateTime}) + insert into tb_coupon_product(coupon_id, product_id, num, create_time, update_time) + values (#{couponId}, #{productId}, #{num}, #{createTime}, #{updateTime}) - insert into tb_activate_product(activate_id, product_id, num, create_time, update_time) + insert into tb_coupon_product(coupon_id, product_id, num, create_time, update_time) values - (#{entity.activateId}, #{entity.productId}, #{entity.num}, #{entity.createTime}, #{entity.updateTime}) + (#{entity.couponId}, #{entity.productId}, #{entity.num}, #{entity.createTime}, #{entity.updateTime}) - update tb_activate_product + update tb_coupon_product - - activate_id = #{activateId}, + + coupon_id = #{couponId}, product_id = #{productId}, @@ -106,7 +107,9 @@ id, activate_id, product_id, num, create_time, update_time - delete from tb_activate_product where id = #{id} + delete + from tb_coupon_product + where id = #{id} diff --git a/src/main/resources/mapper/TbDeviceOperateInfoMapper.xml b/src/main/resources/mapper/TbDeviceOperateInfoMapper.xml deleted file mode 100644 index bd36c49..0000000 --- a/src/main/resources/mapper/TbDeviceOperateInfoMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - id, deviceNo, type, shop_id, createTime, remark - - - - delete from tb_device_operate_info - where id = #{id,jdbcType=INTEGER} - - - insert into tb_device_operate_info (id, deviceNo, type, - shop_id, createTime, remark - ) - values (#{id,jdbcType=INTEGER}, #{deviceno,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, - #{shopId,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR} - ) - - - insert into tb_device_operate_info - - - id, - - - deviceNo, - - - type, - - - shop_id, - - - createTime, - - - remark, - - - - - #{id,jdbcType=INTEGER}, - - - #{deviceno,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - #{shopId,jdbcType=VARCHAR}, - - - #{createtime,jdbcType=TIMESTAMP}, - - - #{remark,jdbcType=VARCHAR}, - - - - - update tb_device_operate_info - - - deviceNo = #{deviceno,jdbcType=VARCHAR}, - - - type = #{type,jdbcType=VARCHAR}, - - - shop_id = #{shopId,jdbcType=VARCHAR}, - - - createTime = #{createtime,jdbcType=TIMESTAMP}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_device_operate_info - set deviceNo = #{deviceno,jdbcType=VARCHAR}, - type = #{type,jdbcType=VARCHAR}, - shop_id = #{shopId,jdbcType=VARCHAR}, - createTime = #{createtime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbDeviceStockMapper.xml b/src/main/resources/mapper/TbDeviceStockMapper.xml deleted file mode 100644 index a4e401e..0000000 --- a/src/main/resources/mapper/TbDeviceStockMapper.xml +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, code, snNo, orderNo, price, type, groupNo, buyMercName, buyMercId, actMercName, - actMercId, status, createTime, createBy, delFlag, remarks, updateTime, deviceNo, - belongUserId, extractUserId, roleCode, inStockTime, transferStatus, bindTime - - - - delete from tb_device_stock - where id = #{id,jdbcType=INTEGER} - - - insert into tb_device_stock (id, code, snNo, - orderNo, price, type, - groupNo, buyMercName, buyMercId, - actMercName, actMercId, status, - createTime, createBy, delFlag, - remarks, updateTime, deviceNo, - belongUserId, extractUserId, roleCode, - inStockTime, transferStatus, bindTime - ) - values (#{id,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{snno,jdbcType=VARCHAR}, - #{orderno,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{type,jdbcType=VARCHAR}, - #{groupno,jdbcType=VARCHAR}, #{buymercname,jdbcType=VARCHAR}, #{buymercid,jdbcType=VARCHAR}, - #{actmercname,jdbcType=VARCHAR}, #{actmercid,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, - #{createtime,jdbcType=TIMESTAMP}, #{createby,jdbcType=VARCHAR}, #{delflag,jdbcType=VARCHAR}, - #{remarks,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, #{deviceno,jdbcType=VARCHAR}, - #{belonguserid,jdbcType=INTEGER}, #{extractuserid,jdbcType=INTEGER}, #{rolecode,jdbcType=VARCHAR}, - #{instocktime,jdbcType=TIMESTAMP}, #{transferstatus,jdbcType=VARCHAR}, #{bindtime,jdbcType=TIMESTAMP} - ) - - - insert into tb_device_stock - - - id, - - - code, - - - snNo, - - - orderNo, - - - price, - - - type, - - - groupNo, - - - buyMercName, - - - buyMercId, - - - actMercName, - - - actMercId, - - - status, - - - createTime, - - - createBy, - - - delFlag, - - - remarks, - - - updateTime, - - - deviceNo, - - - belongUserId, - - - extractUserId, - - - roleCode, - - - inStockTime, - - - transferStatus, - - - bindTime, - - - - - #{id,jdbcType=INTEGER}, - - - #{code,jdbcType=VARCHAR}, - - - #{snno,jdbcType=VARCHAR}, - - - #{orderno,jdbcType=VARCHAR}, - - - #{price,jdbcType=DECIMAL}, - - - #{type,jdbcType=VARCHAR}, - - - #{groupno,jdbcType=VARCHAR}, - - - #{buymercname,jdbcType=VARCHAR}, - - - #{buymercid,jdbcType=VARCHAR}, - - - #{actmercname,jdbcType=VARCHAR}, - - - #{actmercid,jdbcType=VARCHAR}, - - - #{status,jdbcType=VARCHAR}, - - - #{createtime,jdbcType=TIMESTAMP}, - - - #{createby,jdbcType=VARCHAR}, - - - #{delflag,jdbcType=VARCHAR}, - - - #{remarks,jdbcType=VARCHAR}, - - - #{updatetime,jdbcType=TIMESTAMP}, - - - #{deviceno,jdbcType=VARCHAR}, - - - #{belonguserid,jdbcType=INTEGER}, - - - #{extractuserid,jdbcType=INTEGER}, - - - #{rolecode,jdbcType=VARCHAR}, - - - #{instocktime,jdbcType=TIMESTAMP}, - - - #{transferstatus,jdbcType=VARCHAR}, - - - #{bindtime,jdbcType=TIMESTAMP}, - - - - - update tb_device_stock - - - code = #{code,jdbcType=VARCHAR}, - - - snNo = #{snno,jdbcType=VARCHAR}, - - - orderNo = #{orderno,jdbcType=VARCHAR}, - - - price = #{price,jdbcType=DECIMAL}, - - - type = #{type,jdbcType=VARCHAR}, - - - groupNo = #{groupno,jdbcType=VARCHAR}, - - - buyMercName = #{buymercname,jdbcType=VARCHAR}, - - - buyMercId = #{buymercid,jdbcType=VARCHAR}, - - - actMercName = #{actmercname,jdbcType=VARCHAR}, - - - actMercId = #{actmercid,jdbcType=VARCHAR}, - - - status = #{status,jdbcType=VARCHAR}, - - - createTime = #{createtime,jdbcType=TIMESTAMP}, - - - createBy = #{createby,jdbcType=VARCHAR}, - - - delFlag = #{delflag,jdbcType=VARCHAR}, - - - remarks = #{remarks,jdbcType=VARCHAR}, - - - updateTime = #{updatetime,jdbcType=TIMESTAMP}, - - - deviceNo = #{deviceno,jdbcType=VARCHAR}, - - - belongUserId = #{belonguserid,jdbcType=INTEGER}, - - - extractUserId = #{extractuserid,jdbcType=INTEGER}, - - - roleCode = #{rolecode,jdbcType=VARCHAR}, - - - inStockTime = #{instocktime,jdbcType=TIMESTAMP}, - - - transferStatus = #{transferstatus,jdbcType=VARCHAR}, - - - bindTime = #{bindtime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_device_stock - set code = #{code,jdbcType=VARCHAR}, - snNo = #{snno,jdbcType=VARCHAR}, - orderNo = #{orderno,jdbcType=VARCHAR}, - price = #{price,jdbcType=DECIMAL}, - type = #{type,jdbcType=VARCHAR}, - groupNo = #{groupno,jdbcType=VARCHAR}, - buyMercName = #{buymercname,jdbcType=VARCHAR}, - buyMercId = #{buymercid,jdbcType=VARCHAR}, - actMercName = #{actmercname,jdbcType=VARCHAR}, - actMercId = #{actmercid,jdbcType=VARCHAR}, - status = #{status,jdbcType=VARCHAR}, - createTime = #{createtime,jdbcType=TIMESTAMP}, - createBy = #{createby,jdbcType=VARCHAR}, - delFlag = #{delflag,jdbcType=VARCHAR}, - remarks = #{remarks,jdbcType=VARCHAR}, - updateTime = #{updatetime,jdbcType=TIMESTAMP}, - deviceNo = #{deviceno,jdbcType=VARCHAR}, - belongUserId = #{belonguserid,jdbcType=INTEGER}, - extractUserId = #{extractuserid,jdbcType=INTEGER}, - roleCode = #{rolecode,jdbcType=VARCHAR}, - inStockTime = #{instocktime,jdbcType=TIMESTAMP}, - transferStatus = #{transferstatus,jdbcType=VARCHAR}, - bindTime = #{bindtime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbIntegralFlowMapper.xml b/src/main/resources/mapper/TbIntegralFlowMapper.xml deleted file mode 100644 index 046f61b..0000000 --- a/src/main/resources/mapper/TbIntegralFlowMapper.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - id, user_id, num, create_time, update_time - - - - delete from tb_integral_flow - where id = #{id,jdbcType=INTEGER} - - - insert into tb_integral_flow (id, user_id, num, - create_time, update_time) - values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=VARCHAR}, #{num,jdbcType=DECIMAL}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - - insert into tb_integral_flow - - - id, - - - user_id, - - - num, - - - create_time, - - - update_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{userId,jdbcType=VARCHAR}, - - - #{num,jdbcType=DECIMAL}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update tb_integral_flow - - - user_id = #{userId,jdbcType=VARCHAR}, - - - num = #{num,jdbcType=DECIMAL}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_integral_flow - set user_id = #{userId,jdbcType=VARCHAR}, - num = #{num,jdbcType=DECIMAL}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbIntegralMapper.xml b/src/main/resources/mapper/TbIntegralMapper.xml deleted file mode 100644 index 86c3c68..0000000 --- a/src/main/resources/mapper/TbIntegralMapper.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - id, user_id, num, status, create_time, update_time - - - - - delete from tb_integral - where id = #{id,jdbcType=INTEGER} - - - insert into tb_integral (id, user_id, num, - status, create_time, update_time - ) - values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=VARCHAR}, #{num,jdbcType=DECIMAL}, - #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into tb_integral - - - id, - - - user_id, - - - num, - - - status, - - - create_time, - - - update_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{userId,jdbcType=VARCHAR}, - - - #{num,jdbcType=DECIMAL}, - - - #{status,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update tb_integral - - - user_id = #{userId,jdbcType=VARCHAR}, - - - num = #{num,jdbcType=DECIMAL}, - - - status = #{status,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_integral - set user_id = #{userId,jdbcType=VARCHAR}, - num = #{num,jdbcType=DECIMAL}, - status = #{status,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbMerchantCouponMapper.xml b/src/main/resources/mapper/TbMerchantCouponMapper.xml deleted file mode 100644 index 37ceb45..0000000 --- a/src/main/resources/mapper/TbMerchantCouponMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/TbParamsMapper.xml b/src/main/resources/mapper/TbParamsMapper.xml deleted file mode 100644 index 9696d6d..0000000 --- a/src/main/resources/mapper/TbParamsMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - id, integral_ratio, trade_ratio - - - - delete from tb_params - where id = #{id,jdbcType=INTEGER} - - - insert into tb_params (id, integral_ratio, trade_ratio - ) - values (#{id,jdbcType=INTEGER}, #{integralRatio,jdbcType=DECIMAL}, #{tradeRatio,jdbcType=DECIMAL} - ) - - - insert into tb_params - - - id, - - - integral_ratio, - - - trade_ratio, - - - - - #{id,jdbcType=INTEGER}, - - - #{integralRatio,jdbcType=DECIMAL}, - - - #{tradeRatio,jdbcType=DECIMAL}, - - - - - update tb_params - - - integral_ratio = #{integralRatio,jdbcType=DECIMAL}, - - - trade_ratio = #{tradeRatio,jdbcType=DECIMAL}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_params - set integral_ratio = #{integralRatio,jdbcType=DECIMAL}, - trade_ratio = #{tradeRatio,jdbcType=DECIMAL} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbPlussDeviceGoodsMapper.xml b/src/main/resources/mapper/TbPlussDeviceGoodsMapper.xml deleted file mode 100644 index b67bfe7..0000000 --- a/src/main/resources/mapper/TbPlussDeviceGoodsMapper.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id, code, name, deviceLogo, introDesc, sort, status, tagId, depositFlag, createTime, - updateTime - - - detail - - - - delete from tb_pluss_device_goods - where id = #{id,jdbcType=INTEGER} - - - insert into tb_pluss_device_goods (id, code, name, - deviceLogo, introDesc, sort, - status, tagId, depositFlag, - createTime, updateTime, detail - ) - values (#{id,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, - #{devicelogo,jdbcType=VARCHAR}, #{introdesc,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, - #{status,jdbcType=INTEGER}, #{tagid,jdbcType=INTEGER}, #{depositflag,jdbcType=VARCHAR}, - #{createtime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}, #{detail,jdbcType=LONGVARCHAR} - ) - - - insert into tb_pluss_device_goods - - - id, - - - code, - - - name, - - - deviceLogo, - - - introDesc, - - - sort, - - - status, - - - tagId, - - - depositFlag, - - - createTime, - - - updateTime, - - - detail, - - - - - #{id,jdbcType=INTEGER}, - - - #{code,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{devicelogo,jdbcType=VARCHAR}, - - - #{introdesc,jdbcType=VARCHAR}, - - - #{sort,jdbcType=INTEGER}, - - - #{status,jdbcType=INTEGER}, - - - #{tagid,jdbcType=INTEGER}, - - - #{depositflag,jdbcType=VARCHAR}, - - - #{createtime,jdbcType=TIMESTAMP}, - - - #{updatetime,jdbcType=TIMESTAMP}, - - - #{detail,jdbcType=LONGVARCHAR}, - - - - - update tb_pluss_device_goods - - - code = #{code,jdbcType=VARCHAR}, - - - name = #{name,jdbcType=VARCHAR}, - - - deviceLogo = #{devicelogo,jdbcType=VARCHAR}, - - - introDesc = #{introdesc,jdbcType=VARCHAR}, - - - sort = #{sort,jdbcType=INTEGER}, - - - status = #{status,jdbcType=INTEGER}, - - - tagId = #{tagid,jdbcType=INTEGER}, - - - depositFlag = #{depositflag,jdbcType=VARCHAR}, - - - createTime = #{createtime,jdbcType=TIMESTAMP}, - - - updateTime = #{updatetime,jdbcType=TIMESTAMP}, - - - detail = #{detail,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_pluss_device_goods - set code = #{code,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, - deviceLogo = #{devicelogo,jdbcType=VARCHAR}, - introDesc = #{introdesc,jdbcType=VARCHAR}, - sort = #{sort,jdbcType=INTEGER}, - status = #{status,jdbcType=INTEGER}, - tagId = #{tagid,jdbcType=INTEGER}, - depositFlag = #{depositflag,jdbcType=VARCHAR}, - createTime = #{createtime,jdbcType=TIMESTAMP}, - updateTime = #{updatetime,jdbcType=TIMESTAMP}, - detail = #{detail,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=INTEGER} - - - update tb_pluss_device_goods - set code = #{code,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, - deviceLogo = #{devicelogo,jdbcType=VARCHAR}, - introDesc = #{introdesc,jdbcType=VARCHAR}, - sort = #{sort,jdbcType=INTEGER}, - status = #{status,jdbcType=INTEGER}, - tagId = #{tagid,jdbcType=INTEGER}, - depositFlag = #{depositflag,jdbcType=VARCHAR}, - createTime = #{createtime,jdbcType=TIMESTAMP}, - updateTime = #{updatetime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbReceiptSalesMapper.xml b/src/main/resources/mapper/TbReceiptSalesMapper.xml deleted file mode 100644 index 0f0e0c5..0000000 --- a/src/main/resources/mapper/TbReceiptSalesMapper.xml +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - id, title, logo, show_contact_info, show_member, show_member_code, show_member_score, - show_member_wallet, footer_remark, show_cash_charge, show_serial_no, big_serial_no, - header_text, header_text_align, footer_text, footer_text_align, footer_image, pre_print, - created_at, updated_at - - - - delete from tb_receipt_sales - where id = #{id,jdbcType=INTEGER} - - - insert into tb_receipt_sales (id, title, logo, - show_contact_info, show_member, show_member_code, - show_member_score, show_member_wallet, footer_remark, - show_cash_charge, show_serial_no, big_serial_no, - header_text, header_text_align, footer_text, - footer_text_align, footer_image, pre_print, - created_at, updated_at) - values (#{id,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{logo,jdbcType=VARCHAR}, - #{showContactInfo,jdbcType=BIT}, #{showMember,jdbcType=BIT}, #{showMemberCode,jdbcType=BIT}, - #{showMemberScore,jdbcType=BIT}, #{showMemberWallet,jdbcType=BIT}, #{footerRemark,jdbcType=VARCHAR}, - #{showCashCharge,jdbcType=BIT}, #{showSerialNo,jdbcType=BIT}, #{bigSerialNo,jdbcType=BIT}, - #{headerText,jdbcType=VARCHAR}, #{headerTextAlign,jdbcType=VARCHAR}, #{footerText,jdbcType=VARCHAR}, - #{footerTextAlign,jdbcType=VARCHAR}, #{footerImage,jdbcType=VARCHAR}, #{prePrint,jdbcType=VARCHAR}, - #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}) - - - insert into tb_receipt_sales - - - id, - - - title, - - - logo, - - - show_contact_info, - - - show_member, - - - show_member_code, - - - show_member_score, - - - show_member_wallet, - - - footer_remark, - - - show_cash_charge, - - - show_serial_no, - - - big_serial_no, - - - header_text, - - - header_text_align, - - - footer_text, - - - footer_text_align, - - - footer_image, - - - pre_print, - - - created_at, - - - updated_at, - - - - - #{id,jdbcType=INTEGER}, - - - #{title,jdbcType=VARCHAR}, - - - #{logo,jdbcType=VARCHAR}, - - - #{showContactInfo,jdbcType=BIT}, - - - #{showMember,jdbcType=BIT}, - - - #{showMemberCode,jdbcType=BIT}, - - - #{showMemberScore,jdbcType=BIT}, - - - #{showMemberWallet,jdbcType=BIT}, - - - #{footerRemark,jdbcType=VARCHAR}, - - - #{showCashCharge,jdbcType=BIT}, - - - #{showSerialNo,jdbcType=BIT}, - - - #{bigSerialNo,jdbcType=BIT}, - - - #{headerText,jdbcType=VARCHAR}, - - - #{headerTextAlign,jdbcType=VARCHAR}, - - - #{footerText,jdbcType=VARCHAR}, - - - #{footerTextAlign,jdbcType=VARCHAR}, - - - #{footerImage,jdbcType=VARCHAR}, - - - #{prePrint,jdbcType=VARCHAR}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - - - update tb_receipt_sales - - - title = #{title,jdbcType=VARCHAR}, - - - logo = #{logo,jdbcType=VARCHAR}, - - - show_contact_info = #{showContactInfo,jdbcType=BIT}, - - - show_member = #{showMember,jdbcType=BIT}, - - - show_member_code = #{showMemberCode,jdbcType=BIT}, - - - show_member_score = #{showMemberScore,jdbcType=BIT}, - - - show_member_wallet = #{showMemberWallet,jdbcType=BIT}, - - - footer_remark = #{footerRemark,jdbcType=VARCHAR}, - - - show_cash_charge = #{showCashCharge,jdbcType=BIT}, - - - show_serial_no = #{showSerialNo,jdbcType=BIT}, - - - big_serial_no = #{bigSerialNo,jdbcType=BIT}, - - - header_text = #{headerText,jdbcType=VARCHAR}, - - - header_text_align = #{headerTextAlign,jdbcType=VARCHAR}, - - - footer_text = #{footerText,jdbcType=VARCHAR}, - - - footer_text_align = #{footerTextAlign,jdbcType=VARCHAR}, - - - footer_image = #{footerImage,jdbcType=VARCHAR}, - - - pre_print = #{prePrint,jdbcType=VARCHAR}, - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_receipt_sales - set title = #{title,jdbcType=VARCHAR}, - logo = #{logo,jdbcType=VARCHAR}, - show_contact_info = #{showContactInfo,jdbcType=BIT}, - show_member = #{showMember,jdbcType=BIT}, - show_member_code = #{showMemberCode,jdbcType=BIT}, - show_member_score = #{showMemberScore,jdbcType=BIT}, - show_member_wallet = #{showMemberWallet,jdbcType=BIT}, - footer_remark = #{footerRemark,jdbcType=VARCHAR}, - show_cash_charge = #{showCashCharge,jdbcType=BIT}, - show_serial_no = #{showSerialNo,jdbcType=BIT}, - big_serial_no = #{bigSerialNo,jdbcType=BIT}, - header_text = #{headerText,jdbcType=VARCHAR}, - header_text_align = #{headerTextAlign,jdbcType=VARCHAR}, - footer_text = #{footerText,jdbcType=VARCHAR}, - footer_text_align = #{footerTextAlign,jdbcType=VARCHAR}, - footer_image = #{footerImage,jdbcType=VARCHAR}, - pre_print = #{prePrint,jdbcType=VARCHAR}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbReleaseFlowMapper.xml b/src/main/resources/mapper/TbReleaseFlowMapper.xml deleted file mode 100644 index 4d7f97b..0000000 --- a/src/main/resources/mapper/TbReleaseFlowMapper.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - id, user_id, num, type, remark, from_source, create_time,operation_type - - - - - - delete from tb_release_flow - where id = #{id,jdbcType=INTEGER} - - - insert into tb_release_flow (id, user_id, num, - type, remark, from_source, - create_time,operation_type) - values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=VARCHAR}, #{num,jdbcType=DECIMAL}, - #{type,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{fromSource,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{operationType,jdbcType=VARCHAR}) - - - insert into tb_release_flow - - - id, - - - user_id, - - - num, - - - type, - - - remark, - - - from_source, - - - create_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{userId,jdbcType=VARCHAR}, - - - #{num,jdbcType=DECIMAL}, - - - #{type,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{fromSource,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - update tb_release_flow - - - user_id = #{userId,jdbcType=VARCHAR}, - - - num = #{num,jdbcType=DECIMAL}, - - - type = #{type,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - from_source = #{fromSource,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_release_flow - set user_id = #{userId,jdbcType=VARCHAR}, - num = #{num,jdbcType=DECIMAL}, - type = #{type,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - from_source = #{fromSource,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbRenewalsPayLogMapper.xml b/src/main/resources/mapper/TbRenewalsPayLogMapper.xml deleted file mode 100644 index ea09b30..0000000 --- a/src/main/resources/mapper/TbRenewalsPayLogMapper.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id, pay_type, shop_id, order_id, open_id, user_id, transaction_id, amount, status, - remark, attach, expired_at, created_at, updated_at - - - - delete from tb_renewals_pay_log - where id = #{id,jdbcType=INTEGER} - - - insert into tb_renewals_pay_log (id, pay_type, shop_id, - order_id, open_id, user_id, - transaction_id, amount, status, - remark, attach, expired_at, - created_at, updated_at) - values (#{id,jdbcType=INTEGER}, #{payType,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, - #{orderId,jdbcType=VARCHAR}, #{openId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, - #{transactionId,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, #{status,jdbcType=TINYINT}, - #{remark,jdbcType=VARCHAR}, #{attach,jdbcType=VARCHAR}, #{expiredAt,jdbcType=BIGINT}, - #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}) - - - insert into tb_renewals_pay_log - - - id, - - - pay_type, - - - shop_id, - - - order_id, - - - open_id, - - - user_id, - - - transaction_id, - - - amount, - - - status, - - - remark, - - - attach, - - - expired_at, - - - created_at, - - - updated_at, - - - - - #{id,jdbcType=INTEGER}, - - - #{payType,jdbcType=VARCHAR}, - - - #{shopId,jdbcType=VARCHAR}, - - - #{orderId,jdbcType=VARCHAR}, - - - #{openId,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{transactionId,jdbcType=VARCHAR}, - - - #{amount,jdbcType=DECIMAL}, - - - #{status,jdbcType=TINYINT}, - - - #{remark,jdbcType=VARCHAR}, - - - #{attach,jdbcType=VARCHAR}, - - - #{expiredAt,jdbcType=BIGINT}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - - - update tb_renewals_pay_log - - - pay_type = #{payType,jdbcType=VARCHAR}, - - - shop_id = #{shopId,jdbcType=VARCHAR}, - - - order_id = #{orderId,jdbcType=VARCHAR}, - - - open_id = #{openId,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=VARCHAR}, - - - transaction_id = #{transactionId,jdbcType=VARCHAR}, - - - amount = #{amount,jdbcType=DECIMAL}, - - - status = #{status,jdbcType=TINYINT}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - attach = #{attach,jdbcType=VARCHAR}, - - - expired_at = #{expiredAt,jdbcType=BIGINT}, - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_renewals_pay_log - set pay_type = #{payType,jdbcType=VARCHAR}, - shop_id = #{shopId,jdbcType=VARCHAR}, - order_id = #{orderId,jdbcType=VARCHAR}, - open_id = #{openId,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - transaction_id = #{transactionId,jdbcType=VARCHAR}, - amount = #{amount,jdbcType=DECIMAL}, - status = #{status,jdbcType=TINYINT}, - remark = #{remark,jdbcType=VARCHAR}, - attach = #{attach,jdbcType=VARCHAR}, - expired_at = #{expiredAt,jdbcType=BIGINT}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbShopCashSpreadMapper.xml b/src/main/resources/mapper/TbShopCashSpreadMapper.xml deleted file mode 100644 index 87c41c7..0000000 --- a/src/main/resources/mapper/TbShopCashSpreadMapper.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - id, created_at, updated_at - - - sale_receipt, triplicate_receipt, screen_config, tag_config, scale_config - - - - delete from tb_shop_cash_spread - where id = #{id,jdbcType=INTEGER} - - - insert into tb_shop_cash_spread (id, created_at, updated_at, - sale_receipt, triplicate_receipt, - screen_config, tag_config, scale_config - ) - values (#{id,jdbcType=INTEGER}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, - #{saleReceipt,jdbcType=LONGVARCHAR}, #{triplicateReceipt,jdbcType=LONGVARCHAR}, - #{screenConfig,jdbcType=LONGVARCHAR}, #{tagConfig,jdbcType=LONGVARCHAR}, #{scaleConfig,jdbcType=LONGVARCHAR} - ) - - - insert into tb_shop_cash_spread - - - id, - - - created_at, - - - updated_at, - - - sale_receipt, - - - triplicate_receipt, - - - screen_config, - - - tag_config, - - - scale_config, - - - - - #{id,jdbcType=INTEGER}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - #{saleReceipt,jdbcType=LONGVARCHAR}, - - - #{triplicateReceipt,jdbcType=LONGVARCHAR}, - - - #{screenConfig,jdbcType=LONGVARCHAR}, - - - #{tagConfig,jdbcType=LONGVARCHAR}, - - - #{scaleConfig,jdbcType=LONGVARCHAR}, - - - - - update tb_shop_cash_spread - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - sale_receipt = #{saleReceipt,jdbcType=LONGVARCHAR}, - - - triplicate_receipt = #{triplicateReceipt,jdbcType=LONGVARCHAR}, - - - screen_config = #{screenConfig,jdbcType=LONGVARCHAR}, - - - tag_config = #{tagConfig,jdbcType=LONGVARCHAR}, - - - scale_config = #{scaleConfig,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_cash_spread - set created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - sale_receipt = #{saleReceipt,jdbcType=LONGVARCHAR}, - triplicate_receipt = #{triplicateReceipt,jdbcType=LONGVARCHAR}, - screen_config = #{screenConfig,jdbcType=LONGVARCHAR}, - tag_config = #{tagConfig,jdbcType=LONGVARCHAR}, - scale_config = #{scaleConfig,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_cash_spread - set created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbShopCouponMapper.xml b/src/main/resources/mapper/TbShopCouponMapper.xml new file mode 100644 index 0000000..32d2beb --- /dev/null +++ b/src/main/resources/mapper/TbShopCouponMapper.xml @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + , shop_id, title, type, full_amount, discount_amount, description, number, left_number, validity_type, valid_days, days_to_take_effect, valid_start_time, valid_end_time, user_days, use_time_type, use_start_time, use_end_time, use_number, editor, status, create_time, update_time + + + + + + + + + + + insert into tb_shop_coupon(shop_id, title, type, full_amount, discount_amount, description, number, left_number, + validity_type, valid_days, days_to_take_effect, valid_start_time, valid_end_time, + user_days, use_time_type, use_start_time, use_end_time, use_number, editor, status, + create_time, update_time) + values (#{shopId}, #{title}, #{type}, #{fullAmount}, #{discountAmount}, #{description}, #{number}, + #{leftNumber}, #{validityType}, #{validDays}, #{daysToTakeEffect}, #{validStartTime}, #{validEndTime}, + #{userDays}, #{useTimeType}, #{useStartTime}, #{useEndTime}, #{useNumber}, #{editor}, #{status}, + #{createTime}, #{updateTime}) + + + + insert into tb_shop_coupon(shop_id, title, type, full_amount, discount_amount, description, number, left_number, + validity_type, valid_days, days_to_take_effect, valid_start_time, valid_end_time, user_days, use_time_type, + use_start_time, use_end_time, use_number, editor, status, create_time, update_time) + values + + (#{entity.shopId}, #{entity.title}, #{entity.type}, #{entity.fullAmount}, #{entity.discountAmount}, + #{entity.description}, #{entity.number}, #{entity.leftNumber}, #{entity.validityType}, #{entity.validDays}, + #{entity.daysToTakeEffect}, #{entity.validStartTime}, #{entity.validEndTime}, #{entity.userDays}, + #{entity.useTimeType}, #{entity.useStartTime}, #{entity.useEndTime}, #{entity.useNumber}, #{entity.editor}, + #{entity.status}, #{entity.createTime}, #{entity.updateTime}) + + + + + + update tb_shop_coupon + + + shop_id = #{shopId}, + + + title = #{title}, + + + type = #{type}, + + + full_amount = #{fullAmount}, + + + discount_amount = #{discountAmount}, + + + description = #{description}, + + + number = #{number}, + + + left_number = #{leftNumber}, + + + validity_type = #{validityType}, + + + valid_days = #{validDays}, + + + days_to_take_effect = #{daysToTakeEffect}, + + + valid_start_time = #{validStartTime}, + + + valid_end_time = #{validEndTime}, + + + user_days = #{userDays}, + + + use_time_type = #{useTimeType}, + + + use_start_time = #{useStartTime}, + + + use_end_time = #{useEndTime}, + + + use_number = #{useNumber}, + + + editor = #{editor}, + + + status = #{status}, + + + create_time = #{createTime}, + + + update_time = #{updateTime}, + + + where id = #{id} + + + + + delete + from tb_shop_coupon + where id = #{id} + + + + diff --git a/src/main/resources/mapper/TbShopCurrencyMapper.xml b/src/main/resources/mapper/TbShopCurrencyMapper.xml deleted file mode 100644 index 503f4e0..0000000 --- a/src/main/resources/mapper/TbShopCurrencyMapper.xml +++ /dev/null @@ -1,325 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, shop_id, prepare_amount, currency, decimals_digits, discount_round, merchant_id, - small_change, enable_custom_discount, max_discount, max_percent, biz_duration, allow_web_pay, - is_auto_to_zero, is_include_tax_price, tax_number, created_at, updated_at, auto_lock_screen, - voice_notification - - - discount_configs, service_charge - - - - delete from tb_shop_currency - where id = #{id,jdbcType=INTEGER} - - - insert into tb_shop_currency (id, shop_id, prepare_amount, - currency, decimals_digits, discount_round, - merchant_id, small_change, enable_custom_discount, - max_discount, max_percent, biz_duration, - allow_web_pay, is_auto_to_zero, is_include_tax_price, - tax_number, created_at, updated_at, - auto_lock_screen, voice_notification, discount_configs, - service_charge) - values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=VARCHAR}, #{prepareAmount,jdbcType=DECIMAL}, - #{currency,jdbcType=VARCHAR}, #{decimalsDigits,jdbcType=TINYINT}, #{discountRound,jdbcType=VARCHAR}, - #{merchantId,jdbcType=VARCHAR}, #{smallChange,jdbcType=TINYINT}, #{enableCustomDiscount,jdbcType=TINYINT}, - #{maxDiscount,jdbcType=DECIMAL}, #{maxPercent,jdbcType=DOUBLE}, #{bizDuration,jdbcType=VARCHAR}, - #{allowWebPay,jdbcType=TINYINT}, #{isAutoToZero,jdbcType=TINYINT}, #{isIncludeTaxPrice,jdbcType=TINYINT}, - #{taxNumber,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, - #{autoLockScreen,jdbcType=TINYINT}, #{voiceNotification,jdbcType=TINYINT}, #{discountConfigs,jdbcType=LONGVARCHAR}, - #{serviceCharge,jdbcType=LONGVARCHAR}) - - - insert into tb_shop_currency - - - id, - - - shop_id, - - - prepare_amount, - - - currency, - - - decimals_digits, - - - discount_round, - - - merchant_id, - - - small_change, - - - enable_custom_discount, - - - max_discount, - - - max_percent, - - - biz_duration, - - - allow_web_pay, - - - is_auto_to_zero, - - - is_include_tax_price, - - - tax_number, - - - created_at, - - - updated_at, - - - auto_lock_screen, - - - voice_notification, - - - discount_configs, - - - service_charge, - - - - - #{id,jdbcType=INTEGER}, - - - #{shopId,jdbcType=VARCHAR}, - - - #{prepareAmount,jdbcType=DECIMAL}, - - - #{currency,jdbcType=VARCHAR}, - - - #{decimalsDigits,jdbcType=TINYINT}, - - - #{discountRound,jdbcType=VARCHAR}, - - - #{merchantId,jdbcType=VARCHAR}, - - - #{smallChange,jdbcType=TINYINT}, - - - #{enableCustomDiscount,jdbcType=TINYINT}, - - - #{maxDiscount,jdbcType=DECIMAL}, - - - #{maxPercent,jdbcType=DOUBLE}, - - - #{bizDuration,jdbcType=VARCHAR}, - - - #{allowWebPay,jdbcType=TINYINT}, - - - #{isAutoToZero,jdbcType=TINYINT}, - - - #{isIncludeTaxPrice,jdbcType=TINYINT}, - - - #{taxNumber,jdbcType=VARCHAR}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - #{autoLockScreen,jdbcType=TINYINT}, - - - #{voiceNotification,jdbcType=TINYINT}, - - - #{discountConfigs,jdbcType=LONGVARCHAR}, - - - #{serviceCharge,jdbcType=LONGVARCHAR}, - - - - - update tb_shop_currency - - - shop_id = #{shopId,jdbcType=VARCHAR}, - - - prepare_amount = #{prepareAmount,jdbcType=DECIMAL}, - - - currency = #{currency,jdbcType=VARCHAR}, - - - decimals_digits = #{decimalsDigits,jdbcType=TINYINT}, - - - discount_round = #{discountRound,jdbcType=VARCHAR}, - - - merchant_id = #{merchantId,jdbcType=VARCHAR}, - - - small_change = #{smallChange,jdbcType=TINYINT}, - - - enable_custom_discount = #{enableCustomDiscount,jdbcType=TINYINT}, - - - max_discount = #{maxDiscount,jdbcType=DECIMAL}, - - - max_percent = #{maxPercent,jdbcType=DOUBLE}, - - - biz_duration = #{bizDuration,jdbcType=VARCHAR}, - - - allow_web_pay = #{allowWebPay,jdbcType=TINYINT}, - - - is_auto_to_zero = #{isAutoToZero,jdbcType=TINYINT}, - - - is_include_tax_price = #{isIncludeTaxPrice,jdbcType=TINYINT}, - - - tax_number = #{taxNumber,jdbcType=VARCHAR}, - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - auto_lock_screen = #{autoLockScreen,jdbcType=TINYINT}, - - - voice_notification = #{voiceNotification,jdbcType=TINYINT}, - - - discount_configs = #{discountConfigs,jdbcType=LONGVARCHAR}, - - - service_charge = #{serviceCharge,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_currency - set shop_id = #{shopId,jdbcType=VARCHAR}, - prepare_amount = #{prepareAmount,jdbcType=DECIMAL}, - currency = #{currency,jdbcType=VARCHAR}, - decimals_digits = #{decimalsDigits,jdbcType=TINYINT}, - discount_round = #{discountRound,jdbcType=VARCHAR}, - merchant_id = #{merchantId,jdbcType=VARCHAR}, - small_change = #{smallChange,jdbcType=TINYINT}, - enable_custom_discount = #{enableCustomDiscount,jdbcType=TINYINT}, - max_discount = #{maxDiscount,jdbcType=DECIMAL}, - max_percent = #{maxPercent,jdbcType=DOUBLE}, - biz_duration = #{bizDuration,jdbcType=VARCHAR}, - allow_web_pay = #{allowWebPay,jdbcType=TINYINT}, - is_auto_to_zero = #{isAutoToZero,jdbcType=TINYINT}, - is_include_tax_price = #{isIncludeTaxPrice,jdbcType=TINYINT}, - tax_number = #{taxNumber,jdbcType=VARCHAR}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - auto_lock_screen = #{autoLockScreen,jdbcType=TINYINT}, - voice_notification = #{voiceNotification,jdbcType=TINYINT}, - discount_configs = #{discountConfigs,jdbcType=LONGVARCHAR}, - service_charge = #{serviceCharge,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_currency - set shop_id = #{shopId,jdbcType=VARCHAR}, - prepare_amount = #{prepareAmount,jdbcType=DECIMAL}, - currency = #{currency,jdbcType=VARCHAR}, - decimals_digits = #{decimalsDigits,jdbcType=TINYINT}, - discount_round = #{discountRound,jdbcType=VARCHAR}, - merchant_id = #{merchantId,jdbcType=VARCHAR}, - small_change = #{smallChange,jdbcType=TINYINT}, - enable_custom_discount = #{enableCustomDiscount,jdbcType=TINYINT}, - max_discount = #{maxDiscount,jdbcType=DECIMAL}, - max_percent = #{maxPercent,jdbcType=DOUBLE}, - biz_duration = #{bizDuration,jdbcType=VARCHAR}, - allow_web_pay = #{allowWebPay,jdbcType=TINYINT}, - is_auto_to_zero = #{isAutoToZero,jdbcType=TINYINT}, - is_include_tax_price = #{isIncludeTaxPrice,jdbcType=TINYINT}, - tax_number = #{taxNumber,jdbcType=VARCHAR}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - auto_lock_screen = #{autoLockScreen,jdbcType=TINYINT}, - voice_notification = #{voiceNotification,jdbcType=TINYINT} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbShopInfoMapper.xml b/src/main/resources/mapper/TbShopInfoMapper.xml index 78d2a24..f531d27 100644 --- a/src/main/resources/mapper/TbShopInfoMapper.xml +++ b/src/main/resources/mapper/TbShopInfoMapper.xml @@ -1,87 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id - , account, shop_code, sub_title, merchant_id, shop_name, chain_name, back_img, - front_img, contact_name, phone, logo, is_deposit, is_supply, cover_img, share_img, - detail, lat, lng, mch_id, register_type, is_wx_ma_independent, address, city, type, - industry, industry_name, business_start_day,business_end_day,business_time, post_time, post_amount_line, on_sale, settle_type, - settle_time, enter_at, expire_at, status, average, order_wait_pay_minute, support_device_number, - distribute_level, created_at, updated_at, proxy_id, shop_qrcode, tag,is_open_yhq,is_use_vip,provinces,cities,districts,is_custom, - is_table_fee,table_fee,eat_model,small_qrcode,payment_qrcode - - - view - - select - , - from tb_shop_info where id = #{id,jdbcType=INTEGER} @@ -114,544 +109,6 @@ - - delete - from tb_shop_info - where id = #{id,jdbcType=INTEGER} - - - insert into tb_shop_info (id, account, shop_code, - sub_title, merchant_id, shop_name, - chain_name, back_img, front_img, - contact_name, phone, logo, - is_deposit, is_supply, cover_img, - share_img, detail, lat, - lng, mch_id, register_type, - is_wx_ma_independent, address, city, - type, industry, industry_name, - business_time, post_time, post_amount_line, - on_sale, settle_type, settle_time, - enter_at, expire_at, status, - average, order_wait_pay_minute, support_device_number, - distribute_level, created_at, updated_at, - proxy_id, view) - values (#{id,jdbcType=INTEGER}, #{account,jdbcType=VARCHAR}, #{shopCode,jdbcType=VARCHAR}, - #{subTitle,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{shopName,jdbcType=VARCHAR}, - #{chainName,jdbcType=VARCHAR}, #{backImg,jdbcType=VARCHAR}, #{frontImg,jdbcType=VARCHAR}, - #{contactName,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{logo,jdbcType=VARCHAR}, - #{isDeposit,jdbcType=TINYINT}, #{isSupply,jdbcType=TINYINT}, #{coverImg,jdbcType=VARCHAR}, - #{shareImg,jdbcType=VARCHAR}, #{detail,jdbcType=VARCHAR}, #{lat,jdbcType=VARCHAR}, - #{lng,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR}, #{registerType,jdbcType=VARCHAR}, - #{isWxMaIndependent,jdbcType=TINYINT}, #{address,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, - #{type,jdbcType=VARCHAR}, #{industry,jdbcType=VARCHAR}, #{industryName,jdbcType=VARCHAR}, - #{businessTime,jdbcType=VARCHAR}, #{postTime,jdbcType=VARCHAR}, #{postAmountLine,jdbcType=DECIMAL}, - #{onSale,jdbcType=TINYINT}, #{settleType,jdbcType=TINYINT}, #{settleTime,jdbcType=VARCHAR}, - #{enterAt,jdbcType=INTEGER}, #{expireAt,jdbcType=BIGINT}, #{status,jdbcType=TINYINT}, - #{average,jdbcType=REAL}, #{orderWaitPayMinute,jdbcType=INTEGER}, - #{supportDeviceNumber,jdbcType=INTEGER}, - #{distributeLevel,jdbcType=TINYINT}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, - #{proxyId,jdbcType=VARCHAR}, #{view,jdbcType=LONGVARCHAR}) - - - insert into tb_shop_info - - - id, - - - account, - - - shop_code, - - - sub_title, - - - merchant_id, - - - shop_name, - - - chain_name, - - - back_img, - - - front_img, - - - contact_name, - - - phone, - - - logo, - - - is_deposit, - - - is_supply, - - - cover_img, - - - share_img, - - - detail, - - - lat, - - - lng, - - - mch_id, - - - register_type, - - - is_wx_ma_independent, - - - address, - - - city, - - - type, - - - industry, - - - industry_name, - - - business_time, - - - post_time, - - - post_amount_line, - - - on_sale, - - - settle_type, - - - settle_time, - - - enter_at, - - - expire_at, - - - status, - - - average, - - - order_wait_pay_minute, - - - support_device_number, - - - distribute_level, - - - created_at, - - - updated_at, - - - proxy_id, - - - view, - - - - - #{id,jdbcType=INTEGER}, - - - #{account,jdbcType=VARCHAR}, - - - #{shopCode,jdbcType=VARCHAR}, - - - #{subTitle,jdbcType=VARCHAR}, - - - #{merchantId,jdbcType=VARCHAR}, - - - #{shopName,jdbcType=VARCHAR}, - - - #{chainName,jdbcType=VARCHAR}, - - - #{backImg,jdbcType=VARCHAR}, - - - #{frontImg,jdbcType=VARCHAR}, - - - #{contactName,jdbcType=VARCHAR}, - - - #{phone,jdbcType=VARCHAR}, - - - #{logo,jdbcType=VARCHAR}, - - - #{isDeposit,jdbcType=TINYINT}, - - - #{isSupply,jdbcType=TINYINT}, - - - #{coverImg,jdbcType=VARCHAR}, - - - #{shareImg,jdbcType=VARCHAR}, - - - #{detail,jdbcType=VARCHAR}, - - - #{lat,jdbcType=VARCHAR}, - - - #{lng,jdbcType=VARCHAR}, - - - #{mchId,jdbcType=VARCHAR}, - - - #{registerType,jdbcType=VARCHAR}, - - - #{isWxMaIndependent,jdbcType=TINYINT}, - - - #{address,jdbcType=VARCHAR}, - - - #{city,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - #{industry,jdbcType=VARCHAR}, - - - #{industryName,jdbcType=VARCHAR}, - - - #{businessTime,jdbcType=VARCHAR}, - - - #{postTime,jdbcType=VARCHAR}, - - - #{postAmountLine,jdbcType=DECIMAL}, - - - #{onSale,jdbcType=TINYINT}, - - - #{settleType,jdbcType=TINYINT}, - - - #{settleTime,jdbcType=VARCHAR}, - - - #{enterAt,jdbcType=INTEGER}, - - - #{expireAt,jdbcType=BIGINT}, - - - #{status,jdbcType=TINYINT}, - - - #{average,jdbcType=REAL}, - - - #{orderWaitPayMinute,jdbcType=INTEGER}, - - - #{supportDeviceNumber,jdbcType=INTEGER}, - - - #{distributeLevel,jdbcType=TINYINT}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - #{proxyId,jdbcType=VARCHAR}, - - - #{view,jdbcType=LONGVARCHAR}, - - - - - update tb_shop_info - - - account = #{account,jdbcType=VARCHAR}, - - - shop_code = #{shopCode,jdbcType=VARCHAR}, - - - sub_title = #{subTitle,jdbcType=VARCHAR}, - - - merchant_id = #{merchantId,jdbcType=VARCHAR}, - - - shop_name = #{shopName,jdbcType=VARCHAR}, - - - chain_name = #{chainName,jdbcType=VARCHAR}, - - - back_img = #{backImg,jdbcType=VARCHAR}, - - - front_img = #{frontImg,jdbcType=VARCHAR}, - - - contact_name = #{contactName,jdbcType=VARCHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - logo = #{logo,jdbcType=VARCHAR}, - - - is_deposit = #{isDeposit,jdbcType=TINYINT}, - - - is_supply = #{isSupply,jdbcType=TINYINT}, - - - cover_img = #{coverImg,jdbcType=VARCHAR}, - - - share_img = #{shareImg,jdbcType=VARCHAR}, - - - detail = #{detail,jdbcType=VARCHAR}, - - - lat = #{lat,jdbcType=VARCHAR}, - - - lng = #{lng,jdbcType=VARCHAR}, - - - mch_id = #{mchId,jdbcType=VARCHAR}, - - - register_type = #{registerType,jdbcType=VARCHAR}, - - - is_wx_ma_independent = #{isWxMaIndependent,jdbcType=TINYINT}, - - - address = #{address,jdbcType=VARCHAR}, - - - city = #{city,jdbcType=VARCHAR}, - - - type = #{type,jdbcType=VARCHAR}, - - - industry = #{industry,jdbcType=VARCHAR}, - - - industry_name = #{industryName,jdbcType=VARCHAR}, - - - business_time = #{businessTime,jdbcType=VARCHAR}, - - - post_time = #{postTime,jdbcType=VARCHAR}, - - - post_amount_line = #{postAmountLine,jdbcType=DECIMAL}, - - - on_sale = #{onSale,jdbcType=TINYINT}, - - - settle_type = #{settleType,jdbcType=TINYINT}, - - - settle_time = #{settleTime,jdbcType=VARCHAR}, - - - enter_at = #{enterAt,jdbcType=INTEGER}, - - - expire_at = #{expireAt,jdbcType=BIGINT}, - - - status = #{status,jdbcType=TINYINT}, - - - average = #{average,jdbcType=REAL}, - - - order_wait_pay_minute = #{orderWaitPayMinute,jdbcType=INTEGER}, - - - support_device_number = #{supportDeviceNumber,jdbcType=INTEGER}, - - - distribute_level = #{distributeLevel,jdbcType=TINYINT}, - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - proxy_id = #{proxyId,jdbcType=VARCHAR}, - - - view = #{view,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_info - set account = #{account,jdbcType=VARCHAR}, - shop_code = #{shopCode,jdbcType=VARCHAR}, - sub_title = #{subTitle,jdbcType=VARCHAR}, - merchant_id = #{merchantId,jdbcType=VARCHAR}, - shop_name = #{shopName,jdbcType=VARCHAR}, - chain_name = #{chainName,jdbcType=VARCHAR}, - back_img = #{backImg,jdbcType=VARCHAR}, - front_img = #{frontImg,jdbcType=VARCHAR}, - contact_name = #{contactName,jdbcType=VARCHAR}, - phone = #{phone,jdbcType=VARCHAR}, - logo = #{logo,jdbcType=VARCHAR}, - is_deposit = #{isDeposit,jdbcType=TINYINT}, - is_supply = #{isSupply,jdbcType=TINYINT}, - cover_img = #{coverImg,jdbcType=VARCHAR}, - share_img = #{shareImg,jdbcType=VARCHAR}, - detail = #{detail,jdbcType=VARCHAR}, - lat = #{lat,jdbcType=VARCHAR}, - lng = #{lng,jdbcType=VARCHAR}, - mch_id = #{mchId,jdbcType=VARCHAR}, - register_type = #{registerType,jdbcType=VARCHAR}, - is_wx_ma_independent = #{isWxMaIndependent,jdbcType=TINYINT}, - address = #{address,jdbcType=VARCHAR}, - city = #{city,jdbcType=VARCHAR}, - type = #{type,jdbcType=VARCHAR}, - industry = #{industry,jdbcType=VARCHAR}, - industry_name = #{industryName,jdbcType=VARCHAR}, - business_time = #{businessTime,jdbcType=VARCHAR}, - post_time = #{postTime,jdbcType=VARCHAR}, - post_amount_line = #{postAmountLine,jdbcType=DECIMAL}, - on_sale = #{onSale,jdbcType=TINYINT}, - settle_type = #{settleType,jdbcType=TINYINT}, - settle_time = #{settleTime,jdbcType=VARCHAR}, - enter_at = #{enterAt,jdbcType=INTEGER}, - expire_at = #{expireAt,jdbcType=BIGINT}, - status = #{status,jdbcType=TINYINT}, - average = #{average,jdbcType=REAL}, - order_wait_pay_minute = #{orderWaitPayMinute,jdbcType=INTEGER}, - support_device_number = #{supportDeviceNumber,jdbcType=INTEGER}, - distribute_level = #{distributeLevel,jdbcType=TINYINT}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - proxy_id = #{proxyId,jdbcType=VARCHAR}, - view = #{view,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_info - set account = #{account,jdbcType=VARCHAR}, - shop_code = #{shopCode,jdbcType=VARCHAR}, - sub_title = #{subTitle,jdbcType=VARCHAR}, - merchant_id = #{merchantId,jdbcType=VARCHAR}, - shop_name = #{shopName,jdbcType=VARCHAR}, - chain_name = #{chainName,jdbcType=VARCHAR}, - back_img = #{backImg,jdbcType=VARCHAR}, - front_img = #{frontImg,jdbcType=VARCHAR}, - contact_name = #{contactName,jdbcType=VARCHAR}, - phone = #{phone,jdbcType=VARCHAR}, - logo = #{logo,jdbcType=VARCHAR}, - is_deposit = #{isDeposit,jdbcType=TINYINT}, - is_supply = #{isSupply,jdbcType=TINYINT}, - cover_img = #{coverImg,jdbcType=VARCHAR}, - share_img = #{shareImg,jdbcType=VARCHAR}, - detail = #{detail,jdbcType=VARCHAR}, - lat = #{lat,jdbcType=VARCHAR}, - lng = #{lng,jdbcType=VARCHAR}, - mch_id = #{mchId,jdbcType=VARCHAR}, - register_type = #{registerType,jdbcType=VARCHAR}, - is_wx_ma_independent = #{isWxMaIndependent,jdbcType=TINYINT}, - address = #{address,jdbcType=VARCHAR}, - city = #{city,jdbcType=VARCHAR}, - type = #{type,jdbcType=VARCHAR}, - industry = #{industry,jdbcType=VARCHAR}, - industry_name = #{industryName,jdbcType=VARCHAR}, - business_time = #{businessTime,jdbcType=VARCHAR}, - post_time = #{postTime,jdbcType=VARCHAR}, - post_amount_line = #{postAmountLine,jdbcType=DECIMAL}, - on_sale = #{onSale,jdbcType=TINYINT}, - settle_type = #{settleType,jdbcType=TINYINT}, - settle_time = #{settleTime,jdbcType=VARCHAR}, - enter_at = #{enterAt,jdbcType=INTEGER}, - expire_at = #{expireAt,jdbcType=BIGINT}, - status = #{status,jdbcType=TINYINT}, - average = #{average,jdbcType=REAL}, - order_wait_pay_minute = #{orderWaitPayMinute,jdbcType=INTEGER}, - support_device_number = #{supportDeviceNumber,jdbcType=INTEGER}, - distribute_level = #{distributeLevel,jdbcType=TINYINT}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - proxy_id = #{proxyId,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - select - , - from tb_shop_info where id IN #{item} - \ No newline at end of file + + + diff --git a/src/main/resources/mapper/TbShopUserMapper.xml b/src/main/resources/mapper/TbShopUserMapper.xml index affea0c..c476b4c 100644 --- a/src/main/resources/mapper/TbShopUserMapper.xml +++ b/src/main/resources/mapper/TbShopUserMapper.xml @@ -436,9 +436,6 @@ - - select - - from tb_split_accounts - where id = #{id,jdbcType=INTEGER} - - - delete from tb_split_accounts - where id = #{id,jdbcType=INTEGER} - - - insert into tb_split_accounts (id, merchant_id, shop_id, - coupons_price, conpons_amount, is_split, - order_amount, create_time, split_time, - trade_day,origin_amount) - values (#{id,jdbcType=INTEGER}, #{merchantId,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, - #{couponsPrice,jdbcType=DECIMAL}, #{conponsAmount,jdbcType=DECIMAL}, #{isSplit,jdbcType=VARCHAR}, - #{orderAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{splitTime,jdbcType=TIMESTAMP}, - #{tradeDay,jdbcType=VARCHAR},#{originAmount,jdbcType=DECIMAL}) - - - insert into tb_split_accounts - - - id, - - - merchant_id, - - - shop_id, - - - coupons_price, - - - conpons_amount, - - - is_split, - - - order_amount, - - - create_time, - - - split_time, - - - trade_day, - - - - - #{id,jdbcType=INTEGER}, - - - #{merchantId,jdbcType=INTEGER}, - - - #{shopId,jdbcType=INTEGER}, - - - #{couponsPrice,jdbcType=DECIMAL}, - - - #{conponsAmount,jdbcType=DECIMAL}, - - - #{isSplit,jdbcType=VARCHAR}, - - - #{orderAmount,jdbcType=DECIMAL}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{splitTime,jdbcType=TIMESTAMP}, - - - #{tradeDay,jdbcType=VARCHAR}, - - - - - update tb_split_accounts - - - merchant_id = #{merchantId,jdbcType=INTEGER}, - - - shop_id = #{shopId,jdbcType=INTEGER}, - - - coupons_price = #{couponsPrice,jdbcType=DECIMAL}, - - - conpons_amount = #{conponsAmount,jdbcType=DECIMAL}, - - - is_split = #{isSplit,jdbcType=VARCHAR}, - - - order_amount = #{orderAmount,jdbcType=DECIMAL}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - split_time = #{splitTime,jdbcType=TIMESTAMP}, - - - trade_day = #{tradeDay,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_split_accounts - set merchant_id = #{merchantId,jdbcType=INTEGER}, - shop_id = #{shopId,jdbcType=INTEGER}, - coupons_price = #{couponsPrice,jdbcType=DECIMAL}, - conpons_amount = #{conponsAmount,jdbcType=DECIMAL}, - is_split = #{isSplit,jdbcType=VARCHAR}, - order_amount = #{orderAmount,jdbcType=DECIMAL}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - split_time = #{splitTime,jdbcType=TIMESTAMP}, - trade_day = #{tradeDay,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbSystemCouponsMapper.xml b/src/main/resources/mapper/TbSystemCouponsMapper.xml deleted file mode 100644 index 115e91f..0000000 --- a/src/main/resources/mapper/TbSystemCouponsMapper.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - id, name, coupons_price, coupons_amount, status, create_time, update_time, end_time,type_name - - - - - - delete from tb_system_coupons - where id = #{id,jdbcType=INTEGER} - - - insert into tb_system_coupons (id, name, coupons_price, - coupons_amount, status, create_time, - update_time, end_time,type_name) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{couponsPrice,jdbcType=DECIMAL}, - #{couponsAmount,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{typeName,jdbcType=VARCHAR}) - - - insert into tb_system_coupons - - - id, - - - name, - - - coupons_price, - - - coupons_amount, - - - status, - - - create_time, - - - update_time, - - - end_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{couponsPrice,jdbcType=DECIMAL}, - - - #{couponsAmount,jdbcType=DECIMAL}, - - - #{status,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{endTime,jdbcType=TIMESTAMP}, - - - - - update tb_system_coupons - - - name = #{name,jdbcType=VARCHAR}, - - - coupons_price = #{couponsPrice,jdbcType=DECIMAL}, - - - coupons_amount = #{couponsAmount,jdbcType=DECIMAL}, - - - status = #{status,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - end_time = #{endTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_system_coupons - set name = #{name,jdbcType=VARCHAR}, - coupons_price = #{couponsPrice,jdbcType=DECIMAL}, - coupons_amount = #{couponsAmount,jdbcType=DECIMAL}, - status = #{status,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - end_time = #{endTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbUserCouponsMapper.xml b/src/main/resources/mapper/TbUserCouponsMapper.xml deleted file mode 100644 index cd27c4b..0000000 --- a/src/main/resources/mapper/TbUserCouponsMapper.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - id, user_id, detail, coupons_price, coupons_amount, status, create_time, update_time, end_time,is_double - - - - - - - - - - delete from tb_user_coupons - where id = #{id,jdbcType=INTEGER} - - - insert into tb_user_coupons (id, user_id, detail, coupons_price, - coupons_amount, status, create_time, - update_time, end_time,is_double) - values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=VARCHAR}, #{detail,jdbcType=VARCHAR}, #{couponsPrice,jdbcType=DECIMAL}, - #{couponsAmount,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{isDouble,jdbcType=VARCHAR}) - - - insert into tb_user_coupons - - - id, - - - user_id, - - - detail, - - - coupons_price, - - - coupons_amount, - - - status, - - - create_time, - - - update_time, - - - end_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{userId,jdbcType=VARCHAR}, - - - #{detail,jdbcType=VARCHAR}, - - - #{couponsPrice,jdbcType=DECIMAL}, - - - #{couponsAmount,jdbcType=DECIMAL}, - - - #{status,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{endTime,jdbcType=TIMESTAMP}, - - - - - update tb_user_coupons - - - user_id = #{userId,jdbcType=VARCHAR}, - - - detail = #{detail,jdbcType=VARCHAR}, - - - coupons_price = #{couponsPrice,jdbcType=DECIMAL}, - - - coupons_amount = #{couponsAmount,jdbcType=DECIMAL}, - - - status = #{status,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - end_time = #{endTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_user_coupons - set user_id = #{userId,jdbcType=VARCHAR}, - coupons_price = #{couponsPrice,jdbcType=DECIMAL}, - detail = #{detail,jdbcType=VARCHAR}, - coupons_amount = #{couponsAmount,jdbcType=DECIMAL}, - status = #{status,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - end_time = #{endTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbWiningParamsMapper.xml b/src/main/resources/mapper/TbWiningParamsMapper.xml deleted file mode 100644 index 00f9f38..0000000 --- a/src/main/resources/mapper/TbWiningParamsMapper.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - id, min_price, max_price, wining_num, wining_user_num,status - - - - - delete from tb_wining_params - where id = #{id,jdbcType=INTEGER} - - - insert into tb_wining_params (id, min_price, max_price, - wining_num, wining_user_num) - values (#{id,jdbcType=INTEGER}, #{minPrice,jdbcType=DECIMAL}, #{maxPrice,jdbcType=DECIMAL}, - #{winingNum,jdbcType=INTEGER}, #{winingUserNum,jdbcType=INTEGER}) - - - insert into tb_wining_params - - - id, - - - min_price, - - - max_price, - - - wining_num, - - - wining_user_num, - - - - - #{id,jdbcType=INTEGER}, - - - #{minPrice,jdbcType=DECIMAL}, - - - #{maxPrice,jdbcType=DECIMAL}, - - - #{winingNum,jdbcType=INTEGER}, - - - #{winingUserNum,jdbcType=INTEGER}, - - - - - update tb_wining_params - - - min_price = #{minPrice,jdbcType=DECIMAL}, - - - max_price = #{maxPrice,jdbcType=DECIMAL}, - - - wining_num = #{winingNum,jdbcType=INTEGER}, - - - wining_user_num = #{winingUserNum,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_wining_params - set min_price = #{minPrice,jdbcType=DECIMAL}, - max_price = #{maxPrice,jdbcType=DECIMAL}, - wining_num = #{winingNum,jdbcType=INTEGER}, - wining_user_num = #{winingUserNum,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbWiningUserMapper.xml b/src/main/resources/mapper/TbWiningUserMapper.xml deleted file mode 100644 index 99bc24d..0000000 --- a/src/main/resources/mapper/TbWiningUserMapper.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, user_name, order_no, order_amount, is_user, create_time, is_refund, refund_amount, - refund_no, refund_pay_type, trade_day, refund_time - - - - delete from tb_wining_user - where id = #{id,jdbcType=INTEGER} - - - insert into tb_wining_user (id, user_name, order_no, - order_amount, is_user, create_time, - is_refund, refund_amount, refund_no, - refund_pay_type, trade_day, refund_time - ) - values (#{id,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, - #{orderAmount,jdbcType=DECIMAL}, #{isUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{isRefund,jdbcType=VARCHAR}, #{refundAmount,jdbcType=DECIMAL}, #{refundNo,jdbcType=VARCHAR}, - #{refundPayType,jdbcType=VARCHAR}, #{tradeDay,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP} - ) - - - insert into tb_wining_user - - - id, - - - user_name, - - - order_no, - - - order_amount, - - - is_user, - - - create_time, - - - is_refund, - - - refund_amount, - - - refund_no, - - - refund_pay_type, - - - trade_day, - - - refund_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{userName,jdbcType=VARCHAR}, - - - #{orderNo,jdbcType=VARCHAR}, - - - #{orderAmount,jdbcType=DECIMAL}, - - - #{isUser,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{isRefund,jdbcType=VARCHAR}, - - - #{refundAmount,jdbcType=DECIMAL}, - - - #{refundNo,jdbcType=VARCHAR}, - - - #{refundPayType,jdbcType=VARCHAR}, - - - #{tradeDay,jdbcType=VARCHAR}, - - - #{refundTime,jdbcType=TIMESTAMP}, - - - - - update tb_wining_user - - - user_name = #{userName,jdbcType=VARCHAR}, - - - order_no = #{orderNo,jdbcType=VARCHAR}, - - - order_amount = #{orderAmount,jdbcType=DECIMAL}, - - - is_user = #{isUser,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - is_refund = #{isRefund,jdbcType=VARCHAR}, - - - refund_amount = #{refundAmount,jdbcType=DECIMAL}, - - - refund_no = #{refundNo,jdbcType=VARCHAR}, - - - refund_pay_type = #{refundPayType,jdbcType=VARCHAR}, - - - trade_day = #{tradeDay,jdbcType=VARCHAR}, - - - refund_time = #{refundTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_wining_user - set user_name = #{userName,jdbcType=VARCHAR}, - order_no = #{orderNo,jdbcType=VARCHAR}, - order_amount = #{orderAmount,jdbcType=DECIMAL}, - is_user = #{isUser,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - is_refund = #{isRefund,jdbcType=VARCHAR}, - refund_amount = #{refundAmount,jdbcType=DECIMAL}, - refund_no = #{refundNo,jdbcType=VARCHAR}, - refund_pay_type = #{refundPayType,jdbcType=VARCHAR}, - trade_day = #{tradeDay,jdbcType=VARCHAR}, - refund_time = #{refundTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbYhqParamsMapper.xml b/src/main/resources/mapper/TbYhqParamsMapper.xml deleted file mode 100644 index 6636929..0000000 --- a/src/main/resources/mapper/TbYhqParamsMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - id, name, min_price, max_price, status - - - - - delete from tb_yhq_params - where id = #{id,jdbcType=INTEGER} - - - insert into tb_yhq_params (id, name, min_price, - max_price, status) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{minPrice,jdbcType=DECIMAL}, - #{maxPrice,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}) - - - insert into tb_yhq_params - - - id, - - - name, - - - min_price, - - - max_price, - - - status, - - - - - #{id,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{minPrice,jdbcType=DECIMAL}, - - - #{maxPrice,jdbcType=DECIMAL}, - - - #{status,jdbcType=VARCHAR}, - - - - - update tb_yhq_params - - - name = #{name,jdbcType=VARCHAR}, - - - min_price = #{minPrice,jdbcType=DECIMAL}, - - - max_price = #{maxPrice,jdbcType=DECIMAL}, - - - status = #{status,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_yhq_params - set name = #{name,jdbcType=VARCHAR}, - min_price = #{minPrice,jdbcType=DECIMAL}, - max_price = #{maxPrice,jdbcType=DECIMAL}, - status = #{status,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/ViewOrderMapper.xml b/src/main/resources/mapper/ViewOrderMapper.xml deleted file mode 100644 index ad79f52..0000000 --- a/src/main/resources/mapper/ViewOrderMapper.xml +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cart_list - - - insert into view_order (ali_paid_amount, id, amount, - bank_paid_amount, billing_id, cash_paid_amount, - created_at, deduct_score, deposit_paid_amount, - discount_amount, freight_amount, is_master, - is_vip, master_id, member_id, - order_no, order_type, other_paid_amount, - paid_time, pay_amount, product_score, - product_type, ref_order_id, refund_able, - refund_amount, send_type, settlement_amount, - shop_id, small_change, status, - table_id, table_party, terminal_snap, - user_id, virtual_paid_amount, wx_paid_amount, - cart_list) - values (#{aliPaidAmount,jdbcType=DECIMAL}, #{id,jdbcType=INTEGER}, #{amount,jdbcType=DECIMAL}, - #{bankPaidAmount,jdbcType=DECIMAL}, #{billingId,jdbcType=VARCHAR}, #{cashPaidAmount,jdbcType=DECIMAL}, - #{createdAt,jdbcType=BIGINT}, #{deductScore,jdbcType=INTEGER}, #{depositPaidAmount,jdbcType=DECIMAL}, - #{discountAmount,jdbcType=DECIMAL}, #{freightAmount,jdbcType=DECIMAL}, #{isMaster,jdbcType=TINYINT}, - #{isVip,jdbcType=TINYINT}, #{masterId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, - #{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=VARCHAR}, #{otherPaidAmount,jdbcType=DECIMAL}, - #{paidTime,jdbcType=BIGINT}, #{payAmount,jdbcType=DECIMAL}, #{productScore,jdbcType=INTEGER}, - #{productType,jdbcType=VARCHAR}, #{refOrderId,jdbcType=VARCHAR}, #{refundAble,jdbcType=TINYINT}, - #{refundAmount,jdbcType=DECIMAL}, #{sendType,jdbcType=VARCHAR}, #{settlementAmount,jdbcType=DECIMAL}, - #{shopId,jdbcType=VARCHAR}, #{smallChange,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, - #{tableId,jdbcType=VARCHAR}, #{tableParty,jdbcType=VARCHAR}, #{terminalSnap,jdbcType=VARCHAR}, - #{userId,jdbcType=VARCHAR}, #{virtualPaidAmount,jdbcType=DECIMAL}, #{wxPaidAmount,jdbcType=DECIMAL}, - #{cartList,jdbcType=LONGVARCHAR}) - - - insert into view_order - - - ali_paid_amount, - - - id, - - - amount, - - - bank_paid_amount, - - - billing_id, - - - cash_paid_amount, - - - created_at, - - - deduct_score, - - - deposit_paid_amount, - - - discount_amount, - - - freight_amount, - - - is_master, - - - is_vip, - - - master_id, - - - member_id, - - - order_no, - - - order_type, - - - other_paid_amount, - - - paid_time, - - - pay_amount, - - - product_score, - - - product_type, - - - ref_order_id, - - - refund_able, - - - refund_amount, - - - send_type, - - - settlement_amount, - - - shop_id, - - - small_change, - - - status, - - - table_id, - - - table_party, - - - terminal_snap, - - - user_id, - - - virtual_paid_amount, - - - wx_paid_amount, - - - cart_list, - - - - - #{aliPaidAmount,jdbcType=DECIMAL}, - - - #{id,jdbcType=INTEGER}, - - - #{amount,jdbcType=DECIMAL}, - - - #{bankPaidAmount,jdbcType=DECIMAL}, - - - #{billingId,jdbcType=VARCHAR}, - - - #{cashPaidAmount,jdbcType=DECIMAL}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{deductScore,jdbcType=INTEGER}, - - - #{depositPaidAmount,jdbcType=DECIMAL}, - - - #{discountAmount,jdbcType=DECIMAL}, - - - #{freightAmount,jdbcType=DECIMAL}, - - - #{isMaster,jdbcType=TINYINT}, - - - #{isVip,jdbcType=TINYINT}, - - - #{masterId,jdbcType=VARCHAR}, - - - #{memberId,jdbcType=VARCHAR}, - - - #{orderNo,jdbcType=VARCHAR}, - - - #{orderType,jdbcType=VARCHAR}, - - - #{otherPaidAmount,jdbcType=DECIMAL}, - - - #{paidTime,jdbcType=BIGINT}, - - - #{payAmount,jdbcType=DECIMAL}, - - - #{productScore,jdbcType=INTEGER}, - - - #{productType,jdbcType=VARCHAR}, - - - #{refOrderId,jdbcType=VARCHAR}, - - - #{refundAble,jdbcType=TINYINT}, - - - #{refundAmount,jdbcType=DECIMAL}, - - - #{sendType,jdbcType=VARCHAR}, - - - #{settlementAmount,jdbcType=DECIMAL}, - - - #{shopId,jdbcType=VARCHAR}, - - - #{smallChange,jdbcType=DECIMAL}, - - - #{status,jdbcType=VARCHAR}, - - - #{tableId,jdbcType=VARCHAR}, - - - #{tableParty,jdbcType=VARCHAR}, - - - #{terminalSnap,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{virtualPaidAmount,jdbcType=DECIMAL}, - - - #{wxPaidAmount,jdbcType=DECIMAL}, - - - #{cartList,jdbcType=LONGVARCHAR}, - - - - \ No newline at end of file