From 688ef1c29f768a336ec73d7234d25da1ca7aef9c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 10:43:09 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderPayDO.java | 80 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerUserAddressDO.java | 109 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderOperateDO.java | 62 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java | 406 ++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml | 41 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MyMetaObjectHandler.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerEvaluateDO.java | 74 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderGoodsDAO.xml | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java | 7
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java | 128 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java | 564 +++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerEvaluateDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java | 37 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderOperateDAO.xml | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderPayDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java | 177 +++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerUserAddressDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderPayDAO.xml | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerUserAddressDAO.xml | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerEvaluateDAO.xml | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderOperateDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderGoodsDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java | 7
30 files changed, 1,959 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
index ed24ae1..9f3a0c6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
@@ -2,10 +2,14 @@
import javax.annotation.Resource;
+import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.LoginReturnsVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.community_backstage.util.MyAESUtil;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -28,11 +32,14 @@
@RestController
@RequestMapping("/")
@Api(tags = {"社区平台登录模块"})
+@Slf4j
public class LoginApi extends BaseController {
@Resource
private TokenService tokenService;
@Resource
private UserService userService;
+ @Resource
+ private CommunityService communityService;
@OperLog(operModul="用户登录",operType = 1)
@ApiOperation(value = "社区平台登录", response = LoginReturnVO.class)
@@ -141,4 +148,34 @@
return r;
}
+ @ApiOperation(value = "商家后台登录", response = LoginReturnVO.class)
+ @PostMapping("loginShopBackStage")
+ public R loginShopBackStage(@RequestBody LoginBody loginBody){
+ String account = loginBody.getAccount();
+ String password = loginBody.getPassword();
+ boolean empty = ObjectUtils.isEmpty(account);
+ boolean empty1 = ObjectUtils.isEmpty(password);
+ if (empty || empty1) {
+ return R.fail("账户密码不能为空");
+ }
+ log.info("登录用户信息【{}】", loginBody);
+ try {
+ R<ConvenientMerchantVO> merchant = communityService.getUserMerchantInfoByAccount(account);
+ if (R.isOk(merchant)) {
+ ConvenientMerchantVO merchantVO =
+ JSONObject.parseObject(JSONObject.toJSONString(merchant.getData()), ConvenientMerchantVO.class);
+ Boolean accountValid = merchantVO.getAccountStatus() == 1;
+ if (accountValid) {
+ R result = tokenService.loginMerchantBackStage(account, loginBody.getPassword(),this.getAppId());
+ return result;
+ } else {
+ return R.fail("账号被禁用");
+ }
+ }
+ return R.fail(merchant.getMsg());
+ } catch (Exception e) {
+ return R.fail("登陆失败了");
+ }
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
new file mode 100644
index 0000000..39ad2ee
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
@@ -0,0 +1,564 @@
+package com.panzhihua.service_community.api;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.service_community.service.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
+import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
+import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
+import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
+import com.panzhihua.common.model.vos.shop.ComShopSysConfVO;
+import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
+import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.service_community.model.dos.ComShopSysConfDO;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("/shopFlower")
+public class ShopFlowerApi {
+
+ @Resource
+ private ComShopFlowerGoodsService comShopFlowerGoodsService;
+// @Resource
+// private ComShopOperLogService comShopOperLogService;
+// @Resource
+// private ComShopOrderService comShopOrderService;
+// @Resource
+// private ComShopCartService comShopCartService;
+// @Resource
+// private ComShopUserAddressService comShopUserAddressService;
+
+ @Resource
+ private ConvenientMerchantService convenientMerchantService;
+ @Resource
+ private UserService userService;
+
+ /*
+ *//**
+ * 分页查询 商家订单
+ *
+ * @param pageComShopOrderSearchDTO
+ * 分页数据
+ * @return 分页订单
+ *//*
+ @PostMapping("/order/page")
+ public R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
+ return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
+ }
+
+ *//**
+ * 根据店铺id查询店铺详情
+ *
+ * @param comShopStoreDTO
+ * 请求参数
+ * @return 店铺详情
+ *//*
+ @PostMapping("shopStoreDetail")
+ public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
+ return comShopStoreService.shopStoreDetail(comShopStoreDTO);
+ }
+
+ *//**
+ * 分页查询商品列表
+ *
+ * @param comShopGoodsDTO
+ * 请求参数
+ * @return 商品列表
+ *//*
+ @PostMapping("/pageShopGoods")
+ public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
+
+ return comShopFlowerGoodsService.pageShopGoods(comShopGoodsDTO);
+ }
+
+ *//**
+ * 根据商品id查询商品详情
+ *
+ * @param goodsId
+ * 商品id
+ * @return 商品信息
+ *//*
+ @PostMapping("shopGoodsDetail")
+ public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
+ return comShopFlowerGoodsService.shopGoodsDetail(goodsId);
+ }
+
+ *//**
+ * 根据用户id查询购物车列表
+ *
+ * @param userId
+ * 用户id
+ * @return 购物车列表信息
+ *//*
+ @PostMapping("shopCartList")
+ public R shopCartList(@RequestParam("userId") Long userId) {
+ return comShopCartService.shopCartList(userId);
+ }
+
+ *//**
+ * 查询用户购物车数量
+ *
+ * @param userId
+ * 用户id
+ * @return 用户购物车商品数量
+ *//*
+ @PostMapping("shopCartUserTotal")
+ public R shopCartUserTotal(@RequestParam("userId") Long userId) {
+ return comShopCartService.shopCartUserTotal(userId);
+ }
+
+ *//**
+ * 购物车添加
+ *
+ * @param comShopCartDTO
+ * 请求参数
+ * @return 添加结果
+ *//*
+ @PostMapping("shopAddCart")
+ public R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO) {
+ return comShopCartService.shopAddCart(comShopCartDTO);
+ }
+
+ *//**
+ * 购物车内商品数量添加
+ *
+ * @param shopEditNubCartDTO
+ * 请求参数
+ * @return 修改结果
+ *//*
+ @PostMapping("shopEditNubCart")
+ public R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO) {
+ return comShopCartService.shopEditNubCart(shopEditNubCartDTO);
+ }
+
+ *//**
+ * 删除购物车记录
+ *
+ * @param Ids
+ * 购物车id集合
+ * @return 删除结果
+ *//*
+ @PostMapping("shopDelCart")
+ public R shopDelCart(@RequestBody List<Long> Ids) {
+ return comShopCartService.shopDelCart(Ids);
+ }
+
+ *//**
+ * 查询用户收货地址列表
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 用户收获地址列表
+ *//*
+ @PostMapping("shopUserAddressList")
+ public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
+ return comShopUserAddressService.shopUserAddressList(comShopAddressDTO);
+ }
+
+ *//**
+ * 用户添加书货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 添加结果
+ *//*
+ @PostMapping("shopAddUserAddress")
+ public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+ return comShopUserAddressService.shopAddUserAddress(comShopAddressDTO);
+ }
+
+ *//**
+ * 用户修改收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 修改结果
+ *//*
+ @PostMapping("shopEditUserAddress")
+ public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+ return comShopUserAddressService.shopEditUserAddress(comShopAddressDTO);
+ }
+
+ *//**
+ * 用户删除收货地址
+ *
+ * @param addressId
+ * 收货地址id
+ * @return 删除结果
+ *//*
+ @PostMapping("shopDelUserAddress")
+ public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
+ return comShopUserAddressService.shopDelUserAddress(addressId);
+ }
+
+ *//**
+ * 订单预览
+ *
+ * @param orderPreviewDTO
+ * 请求参数
+ * @return 订单预览数据
+ *//*
+ @PostMapping("orderPreview")
+ public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
+ return comShopOrderService.orderPreview(orderPreviewDTO);
+ }
+
+ *//**
+ * 创建订单
+ *
+ * @param orderCreateDTO
+ * 创建订单请求参数
+ * @return 创建结果
+ *//*
+ @PostMapping("orderCreate")
+ public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
+ return comShopOrderService.orderCreate(orderCreateDTO);
+ }
+
+ *//**
+ * 分页查询用户订单列表
+ *
+ * @param comOrderListDTO
+ * 请求参数
+ * @return 查询结果
+ *//*
+ @PostMapping("pageOrderList")
+ public R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO) {
+ return comShopOrderService.pageOrderList(comOrderListDTO);
+ }
+
+ *//**
+ * 根据订单id查询订单详情
+ *
+ * @param orderId
+ * 订单id
+ * @return 订单详情
+ *//*
+ @PostMapping("orderDetail")
+ public R orderDetail(@RequestParam("orderId") Long orderId) {
+ return comShopOrderService.orderDetail(orderId);
+ }
+
+ *//**
+ * 根据订单id取消订单
+ *
+ * @param comShopOrderQueryDTO
+ * 请求参数
+ * @return 取消结果
+ *//*
+ @PostMapping("orderCancel")
+ public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+ return comShopOrderService.orderCancel(comShopOrderQueryDTO);
+ }
+
+ *//**
+ * 根据订单id删除订单
+ *
+ * @param orderId
+ * 订单id
+ * @return 删除结果
+ *//*
+ @PostMapping("orderDelete")
+ public R orderDelete(@RequestParam("orderId") Long orderId) {
+ return comShopOrderService.orderDelete(orderId);
+ }
+
+ *//**
+ * 根据订单id确认收货
+ *
+ * @param comShopOrderQueryDTO
+ * 请求参数
+ * @return 确认结果
+ *//*
+ @PostMapping("orderConfirm")
+ public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+ return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
+ }
+
+ *//**
+ * 统计用户订单数量
+ *
+ * @param userId
+ * 用户id
+ * @return 统计结果
+ *//*
+ @PostMapping("orderStatistics")
+ public R orderStatistics(@RequestParam("userId") Long userId) {
+ return comShopOrderService.orderStatistics(userId);
+ }
+
+ *//**
+ * 商品列表-分页查询
+ *
+ * @param pageComShopGoodsDTO
+ * 查询参数
+ * @return PageShopStoreVO
+ *//*
+ @PostMapping("pageGoods")
+ public R pageShopStore(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) {
+ return comShopFlowerGoodsService.pageGoodsList(pageComShopGoodsDTO);
+ }
+
+ *//**
+ * 新增商品
+ *
+ * @param addShopGoodsVO
+ * @return
+ *//*
+ @PostMapping("saveShopGoods")
+ public R saveStore(@RequestBody AddShopGoodsVO addShopGoodsVO) {
+ return comShopFlowerGoodsService.saveShopGoods(addShopGoodsVO);
+ }
+
+ *//**
+ * 编辑商品
+ *
+ * @param addShopGoodsVO
+ * @param id
+ * 商铺Id
+ * @return
+ *//*
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("editShopGoods/{id}")
+ public R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO) {
+ return comShopFlowerGoodsService.editShopGoods(id, addShopGoodsVO);
+ }
+
+ *//**
+ * 删除商品
+ *
+ * @param id
+ * @return
+ *//*
+ @PostMapping("deleteShopGoods")
+ public R deleteShopGoods(@RequestBody Long[] id) {
+ return comShopFlowerGoodsService.deleteShopGoods(id);
+ }
+
+ *//**
+ * 修改商品状态
+ *
+ * @param id
+ * @return
+ *//*
+ @GetMapping("changeShopGoodsStatus")
+ public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
+ return comShopFlowerGoodsService.changeStatus(id, status);
+ }
+
+ *//**
+ * 商家资金的订单详情
+ *
+ * @param id
+ * @return
+ *//*
+ @GetMapping("capitalDetailByStore")
+ public R capitalDetailByStore(@RequestParam("id") Long id) {
+ return comShopOrderService.capitalDetailByStore(id);
+ }
+
+ *//**
+ * 订单发货
+ *
+ * @param orderShipDTO
+ * 发货信息
+ * @return 发货结果
+ *//*
+ @PostMapping("/shipOrder")
+ R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO) {
+ return comShopOrderService.shipOrder(orderShipDTO);
+ }
+
+ *//**
+ * 订单配送
+ *
+ * @param deliverDTO
+ * 订单ID
+ * @return 配送结果
+ *//*
+ @PostMapping("/deliverOrder")
+ R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
+ return comShopOrderService.deliverOrder(deliverDTO);
+ }
+
+ *//**
+ * 订单配送
+ *
+ * @param deliverDTO
+ * 订单ID
+ * @return 配送完成
+ *//*
+ @PostMapping("/finishDeliverOrder")
+ R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
+ return comShopOrderService.finishDeliverOrder(deliverDTO);
+ }
+
+ *//**
+ * 订单导出信息
+ *
+ * @param comShopOrderExportDTO
+ * 订单导出信息
+ * @return 订单导出信息
+ *//*
+ @PostMapping("/shopOrderExportData")
+ R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO) {
+ return comShopOrderService.shopOrderExportData(comShopOrderExportDTO);
+ }
+
+ *//**
+ * 资金管理导出信息
+ *
+ * @param comShopFundsExportDTO
+ * 资金管理导出信息
+ * @return 资金管理导出信息
+ *//*
+ @PostMapping("/shopOrderFundsExportData")
+ R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO) {
+ return comShopOrderService.shopOrderFundsExportData(comShopFundsExportDTO);
+ }
+
+ *//**
+ * 用户资金统计信息
+ *
+ * @param userId
+ * 用户ID
+ * @return 统计信息
+ *//*
+ @GetMapping("/getFundsStat")
+ R getFundsStat(@RequestParam("userId") Long userId) {
+ return comShopOrderService.getFundsStat(userId);
+ }
+
+ *//**
+ * 店铺资金统计信息
+ *
+ * @param pageComShopFundsSearchDTO
+ * 店铺资金
+ * @return 店铺资金统计信息
+ *//*
+ @PostMapping("/pageShopFunds")
+ R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
+ return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
+ }
+
+ *//**
+ * 微信支付订单回调
+ *
+ * @param wxPayNotifyOrderDTO
+ * 订单支付回调参数
+ *//*
+ @PostMapping("/wxOrderPayNotify")
+ public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
+ comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
+ }
+
+ *//**
+ * 点击去支付订单
+ *
+ * @param orderPayDTO
+ * 请求参数
+ * @return 支付对象
+ *//*
+ @PostMapping("/wxPay")
+ public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
+ return comShopOrderService.wxPay(orderPayDTO);
+ }
+
+ *//**
+ * 商城系统配置
+ *
+ * @param comShopSysConfDTO
+ * @return
+ *//*
+ @PostMapping("/conf/edit")
+ R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO) {
+ ComShopSysConfDO comShopSysConfDO = comShopSysConfService.getBaseMapper().selectById(comShopSysConfDTO.getId());
+ switch (comShopSysConfDTO.getHidden()) {
+ case 0:
+ comShopSysConfDO.setVal("0");
+ comShopSysConfDO.setEnabled("1");
+ break;
+ case 1:
+ comShopSysConfDO.setVal("1");
+ comShopSysConfDO.setEnabled("1");
+ break;
+ default:
+ break;
+ }
+ int updated = comShopSysConfService.getBaseMapper().updateById(comShopSysConfDO);
+ if (updated == 1) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ *//**
+ * 商城系统配置查询
+ *
+ * @param pageComShopSysConfDTO
+ * @return
+ *//*
+ @PostMapping("/conf/get")
+ R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO) {
+ List<ComShopSysConfDO> confList =
+ comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>()
+ .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN").orderByDesc(ComShopSysConfDO::getCreate_at));
+ ComShopSysConfVO comShopSysConfVO = new ComShopSysConfVO();
+ if (confList != null && confList.size() > 0) {
+ ComShopSysConfDO firstConf = confList.get(0);
+ BeanUtils.copyProperties(firstConf, comShopSysConfVO);
+ return R.ok(comShopSysConfVO);
+ }
+ return R.ok();
+ }
+
+ *//**
+ * check商家/店铺是否有效
+ * @param userId
+ * @return
+ *//*
+ @GetMapping("/checkStoreIsValid")
+ public R checkStoreIsValid(@RequestParam("userId") Long userId) {
+ Boolean isShopValid = comShopStoreService.checkStoreIsValid(userId);
+ Boolean isConvenientValid = convenientMerchantService.checkStoreIsValid(userId);
+ Boolean isMcsValid = userService.checkUserIsValid(userId, 11);
+ return R.ok(isShopValid || isConvenientValid || isMcsValid);
+ }*/
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MyMetaObjectHandler.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MyMetaObjectHandler.java
index 59bae57..2489992 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MyMetaObjectHandler.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MyMetaObjectHandler.java
@@ -27,6 +27,8 @@
this.strictInsertFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
// 或者
// this.fillStrategy(metaObject, "createTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug)
+ this.strictInsertFill(metaObject, "createdAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
+ this.strictInsertFill(metaObject, "updatedAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
}
@Override
@@ -35,6 +37,7 @@
// this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // 起始版本 3.3.0(推荐)
// 或者
this.strictUpdateFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
+ this.strictUpdateFill(metaObject, "updatedAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
// 或者
// this.fillStrategy(metaObject, "updateTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug)
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerEvaluateDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerEvaluateDAO.java
new file mode 100644
index 0000000..7715741
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerEvaluateDAO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName: ComShopFlowerEvaluateMapper
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: TODO
+ */
+@Mapper
+public interface ComShopFlowerEvaluateDAO extends BaseMapper<ComShopFlowerEvaluateDO> {
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java
index ee40f41..0a8436b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java
@@ -2,12 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsAttrVO;
-import com.panzhihua.common.model.vos.shop.ComShopGoodsAttrVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsAttrDO;
-import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
import java.util.List;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java
index 181be35..f8de9d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java
@@ -3,11 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopFlowerStoreDTO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO;
-import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
import com.panzhihua.common.model.vos.shop.PageShopFlowerGoodsVO;
-import com.panzhihua.common.model.vos.shop.PageShopGoodsVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java
new file mode 100644
index 0000000..e839fcb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName: ComShopFlowerOrderMapper
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: TODO
+ */
+@Mapper
+public interface ComShopFlowerOrderDAO extends BaseMapper<ComShopFlowerOrderDO> {
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderGoodsDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderGoodsDAO.java
new file mode 100644
index 0000000..e759faf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderGoodsDAO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.service_community.model.dos.ComShopFlowerOrderGoodsDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName: ComShopFlowerOrderGoodsMapper
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: TODO
+ */
+@Mapper
+public interface ComShopFlowerOrderGoodsDAO extends BaseMapper<ComShopFlowerOrderGoodsDO> {
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderOperateDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderOperateDAO.java
new file mode 100644
index 0000000..72bc85c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderOperateDAO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.service_community.model.dos.ComShopFlowerOrderOperateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName: ComShopFlowerOrderOperateMapper
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: TODO
+ */
+@Mapper
+public interface ComShopFlowerOrderOperateDAO extends BaseMapper<ComShopFlowerOrderOperateDO> {
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderPayDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderPayDAO.java
new file mode 100644
index 0000000..11abde0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderPayDAO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.service_community.model.dos.ComShopFlowerOrderPayDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName: ComShopFlowerOrderPayMapper
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: TODO
+ */
+@Mapper
+public interface ComShopFlowerOrderPayDAO extends BaseMapper<ComShopFlowerOrderPayDO> {
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java
new file mode 100644
index 0000000..d56a0de
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.service_community.model.dos.ComShopFlowerRefundOrderDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName: ComShopFlowerRefundOrderMapper
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: TODO
+ */
+@Mapper
+public interface ComShopFlowerRefundOrderDAO extends BaseMapper<ComShopFlowerRefundOrderDO> {
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerUserAddressDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerUserAddressDAO.java
new file mode 100644
index 0000000..7751d02
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerUserAddressDAO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.service_community.model.dos.ComShopFlowerUserAddressDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @ClassName: ComShopFlowerUserAddressMapper
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: TODO
+ */
+@Mapper
+public interface ComShopFlowerUserAddressDAO extends BaseMapper<ComShopFlowerUserAddressDO> {
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerEvaluateDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerEvaluateDO.java
new file mode 100644
index 0000000..722ea4f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerEvaluateDO.java
@@ -0,0 +1,74 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerEvaluate
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 评价表
+ */
+
+@TableName(value = "com_shop_flower_evaluate")
+@Data
+public class ComShopFlowerEvaluateDO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * ,主键
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 订单号
+ */
+ @TableField(value = "order_no")
+ private String orderNo;
+
+ /**
+ * 商品id
+ */
+ @TableField(value = "goods_id")
+ private String goodsId;
+
+ /**
+ * 评价人id
+ */
+ @TableField(value = "user_id")
+ private Long userId;
+
+ /**
+ * 评价时间
+ */
+ @TableField(value = "evaluate_time")
+ private Date evaluateTime;
+
+ /**
+ * 评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)
+ */
+ @TableField(value = "evaluate_type")
+ private Integer evaluateType;
+
+ /**
+ * 评价内容
+ */
+ @TableField(value = "evaluate_content")
+ private String evaluateContent;
+
+ /**
+ * 评价图片
+ */
+ @TableField(value = "evaluate_pic")
+ private String evaluatePic;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_at",fill = FieldFill.INSERT)
+ private Date createAt;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java
new file mode 100644
index 0000000..9a34975
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java
@@ -0,0 +1,177 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerOrder
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 花城订单表
+ */
+
+@TableName(value = "com_shop_flower_order")
+@Data
+public class ComShopFlowerOrderDO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 订单id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 店铺id
+ */
+ @TableField(value = "store_id")
+ private Long storeId;
+
+ /**
+ * 用户id
+ */
+ @TableField(value = "user_id")
+ private Long userId;
+
+ /**
+ * 订单号
+ */
+ @TableField(value = "order_no")
+ private String orderNo;
+
+ /**
+ * 支付单号
+ */
+ @TableField(value = "pay_no")
+ private String payNo;
+
+ /**
+ * 微信交易单号
+ */
+ @TableField(value = "wx_tarde_no")
+ private String wxTardeNo;
+
+ /**
+ * 订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)
+ */
+ @TableField(value = "status")
+ private Integer status;
+
+ /**
+ * 支付状态(1.未支付 2.已支付)
+ */
+ @TableField(value = "pay_status")
+ private Integer payStatus;
+
+ /**
+ * 订单收货人id
+ */
+ @TableField(value = "receiver_id")
+ private Long receiverId;
+
+ /**
+ * 删除状态(1.未删除 2.已删除)
+ */
+ @TableField(value = "delete_status")
+ private Integer deleteStatus;
+
+ /**
+ * 订单总金额
+ */
+ @TableField(value = "total_amount")
+ private BigDecimal totalAmount;
+
+ /**
+ * 优惠总金额
+ */
+ @TableField(value = "discount_amount")
+ private BigDecimal discountAmount;
+
+ /**
+ * 支付总金额
+ */
+ @TableField(value = "pay_amount")
+ private BigDecimal payAmount;
+
+ /**
+ * 支付方式（1.微信支付）
+ */
+ @TableField(value = "pay_type")
+ private Integer payType;
+
+ /**
+ * 支付时间
+ */
+ @TableField(value = "pay_time")
+ private Date payTime;
+
+ /**
+ * 配送方式（1.自提 2.快递）
+ */
+ @TableField(value = "delivery_type")
+ private Integer deliveryType;
+
+ /**
+ * 订单发货状态（1.未发货 2.已发货）
+ */
+ @TableField(value = "delivery_status")
+ private Integer deliveryStatus;
+
+ /**
+ * 订单备注
+ */
+ @TableField(value = "remark")
+ private String remark;
+
+ /**
+ * 物流公司
+ */
+ @TableField(value = "logistics_company")
+ private String logisticsCompany;
+
+ /**
+ * 物流单号
+ */
+ @TableField(value = "logistics_no")
+ private String logisticsNo;
+
+ /**
+ * 下单时间
+ */
+ @TableField(value = "create_at",fill = FieldFill.INSERT)
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ @TableField(value = "update_at",fill = FieldFill.UPDATE)
+ private Date updateAt;
+
+ /**
+ * 配送时间
+ */
+ @TableField(value = "delivery_time")
+ private Date deliveryTime;
+
+ /**
+ * 送达时间
+ */
+ @TableField(value = "service_time")
+ private Date serviceTime;
+
+ /**
+ * 收货时间
+ */
+ @TableField(value = "receiving_time")
+ private Date receivingTime;
+
+ /**
+ * 退款时间
+ */
+ @TableField(value = "refund_time")
+ private Date refundTime;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java
new file mode 100644
index 0000000..35ee39d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java
@@ -0,0 +1,406 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerOrderGoods
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 花城订单商品表
+ */
+@TableName(value = "com_shop_flower_order_goods")
+@Data
+public class ComShopFlowerOrderGoodsDO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 订单商品id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 店铺id
+ */
+ @TableField(value = "store_id")
+ private Long storeId;
+
+ /**
+ * 订单id
+ */
+ @TableField(value = "order_id")
+ private Long orderId;
+
+ /**
+ * 用户id
+ */
+ @TableField(value = "user_id")
+ private Long userId;
+
+ /**
+ * 订单号
+ */
+ @TableField(value = "order_no")
+ private String orderNo;
+
+ /**
+ * 商品id
+ */
+ @TableField(value = "goods_id")
+ private Long goodsId;
+
+ /**
+ * 商品规格id
+ */
+ @TableField(value = "goods_attr_id")
+ private Long goodsAttrId;
+
+ /**
+ * 规格名称
+ */
+ @TableField(value = "goods_attr_name")
+ private String goodsAttrName;
+
+ /**
+ * 购买数量
+ */
+ @TableField(value = "amount")
+ private Integer amount;
+
+ /**
+ * 商品规格价格
+ */
+ @TableField(value = "goods_attr_price")
+ private BigDecimal goodsAttrPrice;
+
+ /**
+ * 商品规格图
+ */
+ @TableField(value = "goods_attr_pic")
+ private String goodsAttrPic;
+
+ /**
+ * 原价（划线价）
+ */
+ @TableField(value = "price")
+ private BigDecimal price;
+
+ /**
+ * 包邮价
+ */
+ @TableField(value = "free_shipping_price")
+ private BigDecimal freeShippingPrice;
+
+ /**
+ * 拼单价
+ */
+ @TableField(value = "collate_price")
+ private BigDecimal collatePrice;
+
+ /**
+ * 商品名称
+ */
+ @TableField(value = "goods_name")
+ private String goodsName;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_at")
+ private Date createAt;
+
+ /**
+ * 获取订单商品id
+ *
+ * @return id - 订单商品id
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * 设置订单商品id
+ *
+ * @param id 订单商品id
+ */
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ /**
+ * 获取店铺id
+ *
+ * @return store_id - 店铺id
+ */
+ public Long getStoreId() {
+ return storeId;
+ }
+
+ /**
+ * 设置店铺id
+ *
+ * @param storeId 店铺id
+ */
+ public void setStoreId(Long storeId) {
+ this.storeId = storeId;
+ }
+
+ /**
+ * 获取订单id
+ *
+ * @return order_id - 订单id
+ */
+ public Long getOrderId() {
+ return orderId;
+ }
+
+ /**
+ * 设置订单id
+ *
+ * @param orderId 订单id
+ */
+ public void setOrderId(Long orderId) {
+ this.orderId = orderId;
+ }
+
+ /**
+ * 获取用户id
+ *
+ * @return user_id - 用户id
+ */
+ public Long getUserId() {
+ return userId;
+ }
+
+ /**
+ * 设置用户id
+ *
+ * @param userId 用户id
+ */
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ /**
+ * 获取订单号
+ *
+ * @return order_no - 订单号
+ */
+ public String getOrderNo() {
+ return orderNo;
+ }
+
+ /**
+ * 设置订单号
+ *
+ * @param orderNo 订单号
+ */
+ public void setOrderNo(String orderNo) {
+ this.orderNo = orderNo;
+ }
+
+ /**
+ * 获取商品id
+ *
+ * @return goods_id - 商品id
+ */
+ public Long getGoodsId() {
+ return goodsId;
+ }
+
+ /**
+ * 设置商品id
+ *
+ * @param goodsId 商品id
+ */
+ public void setGoodsId(Long goodsId) {
+ this.goodsId = goodsId;
+ }
+
+ /**
+ * 获取商品规格id
+ *
+ * @return goods_attr_id - 商品规格id
+ */
+ public Long getGoodsAttrId() {
+ return goodsAttrId;
+ }
+
+ /**
+ * 设置商品规格id
+ *
+ * @param goodsAttrId 商品规格id
+ */
+ public void setGoodsAttrId(Long goodsAttrId) {
+ this.goodsAttrId = goodsAttrId;
+ }
+
+ /**
+ * 获取规格名称
+ *
+ * @return goods_attr_name - 规格名称
+ */
+ public String getGoodsAttrName() {
+ return goodsAttrName;
+ }
+
+ /**
+ * 设置规格名称
+ *
+ * @param goodsAttrName 规格名称
+ */
+ public void setGoodsAttrName(String goodsAttrName) {
+ this.goodsAttrName = goodsAttrName;
+ }
+
+ /**
+ * 获取购买数量
+ *
+ * @return amount - 购买数量
+ */
+ public Integer getAmount() {
+ return amount;
+ }
+
+ /**
+ * 设置购买数量
+ *
+ * @param amount 购买数量
+ */
+ public void setAmount(Integer amount) {
+ this.amount = amount;
+ }
+
+ /**
+ * 获取商品规格价格
+ *
+ * @return goods_attr_price - 商品规格价格
+ */
+ public BigDecimal getGoodsAttrPrice() {
+ return goodsAttrPrice;
+ }
+
+ /**
+ * 设置商品规格价格
+ *
+ * @param goodsAttrPrice 商品规格价格
+ */
+ public void setGoodsAttrPrice(BigDecimal goodsAttrPrice) {
+ this.goodsAttrPrice = goodsAttrPrice;
+ }
+
+ /**
+ * 获取商品规格图
+ *
+ * @return goods_attr_pic - 商品规格图
+ */
+ public String getGoodsAttrPic() {
+ return goodsAttrPic;
+ }
+
+ /**
+ * 设置商品规格图
+ *
+ * @param goodsAttrPic 商品规格图
+ */
+ public void setGoodsAttrPic(String goodsAttrPic) {
+ this.goodsAttrPic = goodsAttrPic;
+ }
+
+ /**
+ * 获取原价（划线价）
+ *
+ * @return price - 原价（划线价）
+ */
+ public BigDecimal getPrice() {
+ return price;
+ }
+
+ /**
+ * 设置原价（划线价）
+ *
+ * @param price 原价（划线价）
+ */
+ public void setPrice(BigDecimal price) {
+ this.price = price;
+ }
+
+ /**
+ * 获取包邮价
+ *
+ * @return free_shipping_price - 包邮价
+ */
+ public BigDecimal getFreeShippingPrice() {
+ return freeShippingPrice;
+ }
+
+ /**
+ * 设置包邮价
+ *
+ * @param freeShippingPrice 包邮价
+ */
+ public void setFreeShippingPrice(BigDecimal freeShippingPrice) {
+ this.freeShippingPrice = freeShippingPrice;
+ }
+
+ /**
+ * 获取拼单价
+ *
+ * @return collate_price - 拼单价
+ */
+ public BigDecimal getCollatePrice() {
+ return collatePrice;
+ }
+
+ /**
+ * 设置拼单价
+ *
+ * @param collatePrice 拼单价
+ */
+ public void setCollatePrice(BigDecimal collatePrice) {
+ this.collatePrice = collatePrice;
+ }
+
+ /**
+ * 获取商品名称
+ *
+ * @return goods_name - 商品名称
+ */
+ public String getGoodsName() {
+ return goodsName;
+ }
+
+ /**
+ * 设置商品名称
+ *
+ * @param goodsName 商品名称
+ */
+ public void setGoodsName(String goodsName) {
+ this.goodsName = goodsName;
+ }
+
+ /**
+ * 获取创建时间
+ *
+ * @return create_at - 创建时间
+ */
+ public Date getCreateAt() {
+ return createAt;
+ }
+
+ /**
+ * 设置创建时间
+ *
+ * @param createAt 创建时间
+ */
+ public void setCreateAt(Date createAt) {
+ this.createAt = createAt;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderOperateDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderOperateDO.java
new file mode 100644
index 0000000..6d69464
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderOperateDO.java
@@ -0,0 +1,62 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerOrderOperate
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 花城订单操作记录表
+ */
+@TableName(value = "com_shop_flower_order_operate")
+@Data
+public class ComShopFlowerOrderOperateDO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * ,主键
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 订单号
+ */
+ @TableField(value = "order_no")
+ private String orderNo;
+
+ /**
+ * 操作人
+ */
+ @TableField(value = "operation_by")
+ private String operationBy;
+
+ /**
+ * 操作时间
+ */
+ @TableField(value = "operation_time")
+ private Date operationTime;
+
+ /**
+ * 操作类型(1.创建订单 2.取消订单 3.订单支付 4.订单发货 5.订单完成)
+ */
+ @TableField(value = "operation_type")
+ private Integer operationType;
+
+ /**
+ * 操作内容
+ */
+ @TableField(value = "operation_content")
+ private String operationContent;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_at",fill = FieldFill.INSERT)
+ private Date createAt;
+
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderPayDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderPayDO.java
new file mode 100644
index 0000000..b5f3ea3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderPayDO.java
@@ -0,0 +1,80 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerOrderPay
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 花城订单支付记录表
+ */
+@TableName(value = "com_shop_flower_order_pay")
+@Data
+public class ComShopFlowerOrderPayDO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 订单号
+ */
+ @TableField(value = "order_no")
+ private String orderNo;
+
+ /**
+ * 支付单号
+ */
+ @TableField(value = "pay_no")
+ private String payNo;
+
+ /**
+ * 微信交易号
+ */
+ @TableField(value = "wx_trade_no")
+ private String wxTradeNo;
+
+ /**
+ * 支付状态（1.未支付 2.已支付）
+ */
+ @TableField(value = "pay_status")
+ private Integer payStatus;
+
+ /**
+ * 订单金额
+ */
+ @TableField(value = "order_amount")
+ private BigDecimal orderAmount;
+
+ /**
+ * 支付金额
+ */
+ @TableField(value = "pay_amount")
+ private BigDecimal payAmount;
+
+ /**
+ * 支付时间
+ */
+ @TableField(value = "pay_time")
+ private Date payTime;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_at",fill = FieldFill.INSERT)
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ @TableField(value = "update_at",fill = FieldFill.UPDATE)
+ private Date updateAt;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java
new file mode 100644
index 0000000..de700e6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java
@@ -0,0 +1,128 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerRefundOrder
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 花城退款订单表
+ */
+@TableName(value = "com_shop_flower_refund_order")
+@Data
+public class ComShopFlowerRefundOrderDO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 订单id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 店铺id
+ */
+ @TableField(value = "store_id")
+ private Long storeId;
+
+ /**
+ * 用户id
+ */
+ @TableField(value = "user_id")
+ private Long userId;
+
+ /**
+ * 原始订单号
+ */
+ @TableField(value = "order_no")
+ private String orderNo;
+
+ /**
+ * 原始订单id
+ */
+ @TableField(value = "order_id")
+ private String orderId;
+
+ /**
+ * 退款订单号
+ */
+ @TableField(value = "refund_order_no")
+ private String refundOrderNo;
+
+ /**
+ * 订单状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)
+ */
+ @TableField(value = "status")
+ private Integer status;
+
+ /**
+ * 删除状态(1.未删除 2.已删除)
+ */
+ @TableField(value = "delete_status")
+ private Integer deleteStatus;
+
+ /**
+ * 支付总金额
+ */
+ @TableField(value = "pay_amount")
+ private BigDecimal payAmount;
+
+ /**
+ * 申请退款金额
+ */
+ @TableField(value = "refund_amount")
+ private BigDecimal refundAmount;
+
+ /**
+ * 退款原因
+ */
+ @TableField(value = "refund_reason")
+ private String refundReason;
+
+ /**
+ * 退款照片
+ */
+ @TableField(value = "refund_pic")
+ private String refundPic;
+
+ /**
+ * 申请时间
+ */
+ @TableField(value = "create_at",fill = FieldFill.INSERT)
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ @TableField(value = "update_at")
+ private Date updateAt;
+
+ /**
+ * 处理时间
+ */
+ @TableField(value = "handle_time")
+ private Date handleTime;
+
+ /**
+ * 退款时间
+ */
+ @TableField(value = "refund_time")
+ private Date refundTime;
+
+ /**
+ * 处理结果
+ */
+ @TableField(value = "handle_result")
+ private String handleResult;
+
+ /**
+ * 商家备注
+ */
+ @TableField(value = "remark")
+ private String remark;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerUserAddressDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerUserAddressDO.java
new file mode 100644
index 0000000..bc6c536
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerUserAddressDO.java
@@ -0,0 +1,109 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerUserAddress
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 花城用户收货地址表
+ */
+@TableName(value = "com_shop_flower_user_address")
+@Data
+public class ComShopFlowerUserAddressDO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * ,主键
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 用户id
+ */
+ @TableField(value = "user_id")
+ private Long userId;
+
+ /**
+ * 收货人名称
+ */
+ @TableField(value = "name")
+ private String name;
+
+ /**
+ * 收货人手机号
+ */
+ @TableField(value = "phone")
+ private String phone;
+
+ /**
+ * 收货人省份编码
+ */
+ @TableField(value = "province_code")
+ private String provinceCode;
+
+ /**
+ * 收货人省份名称
+ */
+ @TableField(value = "province_name")
+ private String provinceName;
+
+ /**
+ * 收货人城市编码
+ */
+ @TableField(value = "city_code")
+ private String cityCode;
+
+ /**
+ * 收货人城市名称
+ */
+ @TableField(value = "city_name")
+ private String cityName;
+
+ /**
+ * 收货人区县编码
+ */
+ @TableField(value = "district_code")
+ private String districtCode;
+
+ /**
+ * 收货人区县名称
+ */
+ @TableField(value = "district_name")
+ private String districtName;
+
+ /**
+ * 收货人详细地址
+ */
+ @TableField(value = "detail_address")
+ private String detailAddress;
+
+ /**
+ * 是否是默认地址(1.是 2.否)
+ */
+ @TableField(value = "is_default")
+ private Integer isDefault;
+
+ /**
+ * 创建时间
+ */
+ @TableField(value = "create_at",fill = FieldFill.INSERT)
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ @TableField(value = "update_at",fill = FieldFill.UPDATE)
+ private Date updateAt;
+
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ @TableField(value = "delete_status")
+ private Integer deleteStatus;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java
index 64a4b47..03dc567 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java
@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
@@ -83,7 +81,9 @@
/**
* 创建时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createdAt;
+
/**
* 创建人
*/
@@ -91,6 +91,7 @@
/**
* 更新时间
*/
+ @TableField(fill = FieldFill.UPDATE)
private Date updatedAt;
/**
* 更新人
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java
index b4f6790..4360770 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java
@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
@@ -49,7 +47,9 @@
/**
* 创建时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createdAt;
+
/**
* 创建人
*/
@@ -57,6 +57,7 @@
/**
* 更新时间
*/
+ @TableField(fill = FieldFill.UPDATE)
private Date updatedAt;
/**
* 更新人
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java
index 4c49366..9be93f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java
@@ -1,14 +1,10 @@
package com.panzhihua.service_community.model.dos;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* @title: ConvenientMerchantDO
@@ -107,7 +103,9 @@
/**
* 创建时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createdAt;
+
/**
* 创建人
*/
@@ -115,6 +113,7 @@
/**
* 更新时间
*/
+ @TableField(fill = FieldFill.UPDATE)
private Date updatedAt;
/**
* 更新人
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
index fb4ef7c..30d72c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
@@ -67,7 +67,7 @@
BeanUtils.copyProperties(convenientElevatingPointDTO,convenientElevatingPointDO);
String communityId = convenientElevatingPointDTO.getCommunityId();
if (nonNull(communityId)) {
- ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(","))));
+ ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
if(comActDO!=null){
convenientElevatingPointDO.setCommunityName(comActDO.getName());
}
@@ -91,7 +91,7 @@
}
String communityId = convenientElevatingPointDTO.getCommunityId();
if (nonNull(communityId)) {
- ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(","))));
+ ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
if(comActDO!=null){
convenientElevatingPointDO.setCommunityName(comActDO.getName());
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerEvaluateDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerEvaluateDAO.xml
new file mode 100644
index 0000000..88f8d61
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerEvaluateDAO.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerEvaluateDAO">
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO">
+ <!--@mbg.generated-->
+ <!--@Table com_shop_flower_evaluate-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+ <result column="goods_id" jdbcType="VARCHAR" property="goodsId" />
+ <result column="user_id" jdbcType="BIGINT" property="userId" />
+ <result column="evaluate_time" jdbcType="TIMESTAMP" property="evaluateTime" />
+ <result column="evaluate_type" jdbcType="TINYINT" property="evaluateType" />
+ <result column="evaluate_content" jdbcType="VARCHAR" property="evaluateContent" />
+ <result column="evaluate_pic" jdbcType="VARCHAR" property="evaluatePic" />
+ <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, order_no, goods_id, user_id, evaluate_time, evaluate_type, evaluate_content,
+ evaluate_pic, create_at
+ </sql>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml
new file mode 100644
index 0000000..1be65ac
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerOrderDAO">
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerOrderDO">
+ <!--@mbg.generated-->
+ <!--@Table com_shop_flower_order-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="store_id" jdbcType="BIGINT" property="storeId" />
+ <result column="user_id" jdbcType="BIGINT" property="userId" />
+ <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+ <result column="pay_no" jdbcType="VARCHAR" property="payNo" />
+ <result column="wx_tarde_no" jdbcType="VARCHAR" property="wxTardeNo" />
+ <result column="status" jdbcType="TINYINT" property="status" />
+ <result column="pay_status" jdbcType="TINYINT" property="payStatus" />
+ <result column="receiver_id" jdbcType="BIGINT" property="receiverId" />
+ <result column="delete_status" jdbcType="TINYINT" property="deleteStatus" />
+ <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
+ <result column="discount_amount" jdbcType="DECIMAL" property="discountAmount" />
+ <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
+ <result column="pay_type" jdbcType="TINYINT" property="payType" />
+ <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
+ <result column="delivery_type" jdbcType="TINYINT" property="deliveryType" />
+ <result column="delivery_status" jdbcType="TINYINT" property="deliveryStatus" />
+ <result column="remark" jdbcType="VARCHAR" property="remark" />
+ <result column="logistics_company" jdbcType="VARCHAR" property="logisticsCompany" />
+ <result column="logistics_no" jdbcType="VARCHAR" property="logisticsNo" />
+ <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
+ <result column="update_at" jdbcType="TIMESTAMP" property="updateAt" />
+ <result column="delivery_time" jdbcType="TIMESTAMP" property="deliveryTime" />
+ <result column="service_time" jdbcType="TIMESTAMP" property="serviceTime" />
+ <result column="receiving_time" jdbcType="TIMESTAMP" property="receivingTime" />
+ <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, store_id, user_id, order_no, pay_no, wx_tarde_no, `status`, pay_status, receiver_id,
+ delete_status, total_amount, discount_amount, pay_amount, pay_type, pay_time, delivery_type,
+ delivery_status, remark, logistics_company, logistics_no, create_at, update_at, delivery_time,
+ service_time, receiving_time, refund_time
+ </sql>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderGoodsDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderGoodsDAO.xml
new file mode 100644
index 0000000..c6eb3fb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderGoodsDAO.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerOrderGoodsDAO">
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerOrderGoodsDO">
+ <!--@mbg.generated-->
+ <!--@Table com_shop_flower_order_goods-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="store_id" jdbcType="BIGINT" property="storeId" />
+ <result column="order_id" jdbcType="BIGINT" property="orderId" />
+ <result column="user_id" jdbcType="BIGINT" property="userId" />
+ <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+ <result column="goods_id" jdbcType="BIGINT" property="goodsId" />
+ <result column="goods_attr_id" jdbcType="BIGINT" property="goodsAttrId" />
+ <result column="goods_attr_name" jdbcType="VARCHAR" property="goodsAttrName" />
+ <result column="amount" jdbcType="INTEGER" property="amount" />
+ <result column="goods_attr_price" jdbcType="DECIMAL" property="goodsAttrPrice" />
+ <result column="goods_attr_pic" jdbcType="VARCHAR" property="goodsAttrPic" />
+ <result column="price" jdbcType="DECIMAL" property="price" />
+ <result column="free_shipping_price" jdbcType="DECIMAL" property="freeShippingPrice" />
+ <result column="collate_price" jdbcType="DECIMAL" property="collatePrice" />
+ <result column="goods_name" jdbcType="VARCHAR" property="goodsName" />
+ <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, store_id, order_id, user_id, order_no, goods_id, goods_attr_id, goods_attr_name,
+ amount, goods_attr_price, goods_attr_pic, price, free_shipping_price, collate_price,
+ goods_name, create_at
+ </sql>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderOperateDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderOperateDAO.xml
new file mode 100644
index 0000000..f47949d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderOperateDAO.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerOrderOperateDAO">
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerOrderOperateDO">
+ <!--@mbg.generated-->
+ <!--@Table com_shop_flower_order_operate-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+ <result column="operation_by" jdbcType="VARCHAR" property="operationBy" />
+ <result column="operation_time" jdbcType="TIMESTAMP" property="operationTime" />
+ <result column="operation_type" jdbcType="TINYINT" property="operationType" />
+ <result column="operation_content" jdbcType="VARCHAR" property="operationContent" />
+ <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, order_no, operation_by, operation_time, operation_type, operation_content, create_at
+ </sql>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderPayDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderPayDAO.xml
new file mode 100644
index 0000000..b311bda
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderPayDAO.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerOrderPayDAO">
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerOrderPayDO">
+ <!--@mbg.generated-->
+ <!--@Table com_shop_flower_order_pay-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+ <result column="pay_no" jdbcType="VARCHAR" property="payNo" />
+ <result column="wx_trade_no" jdbcType="VARCHAR" property="wxTradeNo" />
+ <result column="pay_status" jdbcType="TINYINT" property="payStatus" />
+ <result column="order_amount" jdbcType="DECIMAL" property="orderAmount" />
+ <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
+ <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
+ <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
+ <result column="update_at" jdbcType="TIMESTAMP" property="updateAt" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, order_no, pay_no, wx_trade_no, pay_status, order_amount, pay_amount, pay_time,
+ create_at, update_at
+ </sql>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml
new file mode 100644
index 0000000..5bc405f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerRefundOrderDAO">
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerRefundOrderDO">
+ <!--@mbg.generated-->
+ <!--@Table com_shop_flower_refund_order-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="store_id" jdbcType="BIGINT" property="storeId" />
+ <result column="user_id" jdbcType="BIGINT" property="userId" />
+ <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+ <result column="order_id" jdbcType="VARCHAR" property="orderId" />
+ <result column="refund_order_no" jdbcType="VARCHAR" property="refundOrderNo" />
+ <result column="status" jdbcType="TINYINT" property="status" />
+ <result column="delete_status" jdbcType="TINYINT" property="deleteStatus" />
+ <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
+ <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
+ <result column="refund_reason" jdbcType="VARCHAR" property="refundReason" />
+ <result column="refund_pic" jdbcType="VARCHAR" property="refundPic" />
+ <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
+ <result column="update_at" jdbcType="TIMESTAMP" property="updateAt" />
+ <result column="handle_time" jdbcType="TIMESTAMP" property="handleTime" />
+ <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
+ <result column="handle_result" jdbcType="VARCHAR" property="handleResult" />
+ <result column="remark" jdbcType="VARCHAR" property="remark" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, store_id, user_id, order_no, order_id, refund_order_no, `status`, delete_status,
+ pay_amount, refund_amount, refund_reason, refund_pic, create_at, update_at, handle_time,
+ refund_time, handle_result, remark
+ </sql>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerUserAddressDAO.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerUserAddressDAO.xml
new file mode 100644
index 0000000..047c531
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerUserAddressDAO.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerUserAddressDAO">
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerUserAddressDO">
+ <!--@mbg.generated-->
+ <!--@Table com_shop_flower_user_address-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="user_id" jdbcType="BIGINT" property="userId" />
+ <result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="phone" jdbcType="VARCHAR" property="phone" />
+ <result column="province_code" jdbcType="VARCHAR" property="provinceCode" />
+ <result column="province_name" jdbcType="VARCHAR" property="provinceName" />
+ <result column="city_code" jdbcType="VARCHAR" property="cityCode" />
+ <result column="city_name" jdbcType="VARCHAR" property="cityName" />
+ <result column="district_code" jdbcType="VARCHAR" property="districtCode" />
+ <result column="district_name" jdbcType="VARCHAR" property="districtName" />
+ <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
+ <result column="is_default" jdbcType="TINYINT" property="isDefault" />
+ <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
+ <result column="update_at" jdbcType="TIMESTAMP" property="updateAt" />
+ <result column="delete_status" jdbcType="TINYINT" property="deleteStatus" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, user_id, `name`, phone, province_code, province_name, city_code, city_name, district_code,
+ district_name, detail_address, is_default, create_at, update_at, delete_status
+ </sql>
+</mapper>
\ No newline at end of file
--
Gitblit v1.7.1