lidongdong
2023-11-17 df7a9d5bca908cdb4a3a0984b4c63c4be7a89671
商城  商品  兑换地址模块
24个文件已添加
2100 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConfigVO.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConvenientMerchantVO.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingVO.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConfigDao.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConvenientMerchantDao.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightShoppingDao.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightShoppingOrderDao.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightConfig.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightConvenientMerchant.java 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightShopping.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightShoppingOrder.java 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConfigService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightShoppingOrderService.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightShoppingService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConfigServiceImpl.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConvenientMerchantServiceImpl.java 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingServiceImpl.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightComConvenientMerchantsMapper.xml 281 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightCommunityConfigMapper.xml 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightShoppingMapper.xml 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightShoppingOrderMapper.xml 212 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConfigVO.java
New file
@@ -0,0 +1,58 @@
package com.panzhihua.common.model.vos.community.building;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("社区商家配置")
public class NewFightConfigVO implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "社区id")
    private String communityId;
    @ApiModelProperty(value = "兑换地址")
    private String address;
    @ApiModelProperty(value = "纬度")
    private String lat;
    @ApiModelProperty(value = "经度")
    private String lng;
    @ApiModelProperty(value = "兑换状态(1每天  2周一到周五   3周末)")
    private String businessType;
    @ApiModelProperty(value = "兑换开始时间")
    private String businessStartTime;
    @ApiModelProperty(value = "兑换结束时间")
    private String businessEndTime;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConvenientMerchantVO.java
New file
@@ -0,0 +1,82 @@
package com.panzhihua.common.model.vos.community.building;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @title: ConvenientMerchantVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 便民服务商家信息
 * @author: hans
 * @date: 2021/09/16 13:49
 */
@Data
@ApiModel("便民服务商家信息")
public class NewFightConvenientMerchantVO {
    @ApiModelProperty("商家ID")
    private String id;
    @ApiModelProperty("商家名称")
    private String name;
    @ApiModelProperty("商家logo")
    private String logo;
    @ApiModelProperty("联系人")
    private String contacts;
    @ApiModelProperty("咨询电话")
    private String phone;
    @ApiModelProperty("商家地址")
    private String address;
    @ApiModelProperty("纬度")
    private String lat;
    @ApiModelProperty("经度")
    private String lon;
    @ApiModelProperty("商家详细地址")
    private String detailedAddress;
    @ApiModelProperty("商家介绍")
    private String introduction;
    @ApiModelProperty("是否删除")
    private String isDel;
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
    private Date createdAt;
    @ApiModelProperty("创建人")
    private String createdBy;
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
    private Date updatedAt;
    @ApiModelProperty("商家图片")
    private String imgUrl;
    @ApiModelProperty("1启用   2禁用")
    private String status;
    @ApiModelProperty("营业积分")
    private String businessCredit;
    @ApiModelProperty("社区id")
    private String communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java
New file
@@ -0,0 +1,95 @@
package com.panzhihua.common.model.vos.community.building;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("商城订单表")
public class NewFightShoppingOrderVO implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "订单号")
    private String orderNumber;
    @ApiModelProperty(value = "商品id")
    private String goodsId;
    @ApiModelProperty(value = "下单人id")
    private String userId;
    @ApiModelProperty(value = "核销状态(0待核销  1已核销  2订单已取消)")
    private String cancelType;
    @ApiModelProperty(value = "核销时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date cancelTime;
    @ApiModelProperty(value = "支付金额")
    private String palyMoney;
    @ApiModelProperty(value = "创建时间(兑换时间)")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date abolishTime;
    @ApiModelProperty(value = "商品名称")
    private String goodName;
    @ApiModelProperty(value = "商品价格")
    private String goodPrice;
    @ApiModelProperty(value = "商品图片")
    private String coverImgUrl;
    @ApiModelProperty(value = "姓名")
    private String name;
    @ApiModelProperty(value = "电话")
    private String phone;
    @ApiModelProperty(value = "社区id")
    private String communityId;
    @ApiModelProperty(value = "兑换地址")
    private String address;
    @ApiModelProperty(value = "纬度")
    private String lat;
    @ApiModelProperty(value = "经度")
    private String lng;
    @ApiModelProperty(value = "兑换状态(1每天  2周一到周五   3周末)")
    private String businessType;
    @ApiModelProperty(value = "兑换开始时间")
    private String businessStartTime;
    @ApiModelProperty(value = "兑换结束时间")
    private String businessEndTime;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingVO.java
New file
@@ -0,0 +1,54 @@
package com.panzhihua.common.model.vos.community.building;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("商城商品表")
public class NewFightShoppingVO implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "商品名称")
    private String goodName;
    @ApiModelProperty(value = "商品价格")
    private String goodPrice;
    @ApiModelProperty(value = "商品状态(0下架  1上架)")
    private String goodType;
    @ApiModelProperty(value = "商品封面")
    private String coverImgUrl;
    @ApiModelProperty(value = "商品详情内容")
    private String content;
    @ApiModelProperty(value = "社区id")
    private String communityId;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConfigDao.java
New file
@@ -0,0 +1,43 @@
package com.panzhihua.service_dangjian.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.building.NewFightConfigVO;
import com.panzhihua.service_dangjian.entity.NewFightConfig;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface NewFightConfigDao extends BaseMapper<NewFightConfig>
{
    /**
     * 详情
     * @param communityId
     * @return
     */
    NewFightConfig getDetails(@Param("communityId") String communityId);
    /**
     * 新增
     * @param
     * @return
     */
    int addData(@Param("item") NewFightConfigVO item);
    /**
     * 编辑
     * @param item
     * @return
     */
    int editData(@Param("item") NewFightConfigVO item);
    /**
     * 删除
     * @param id
     * @return
     */
    int expurgateData(@Param("communityId") String communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConvenientMerchantDao.java
New file
@@ -0,0 +1,66 @@
package com.panzhihua.service_dangjian.dao;
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.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
 * @title: ConvenientMerchantDAO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 便民服务商家DAO
 * @author: hans
 * @date: 2021/09/16 16:13
 */
@Mapper
public interface NewFightConvenientMerchantDao extends BaseMapper<NewFightConvenientMerchant>
{
    /**
     * 删除便民服务商家
     *
     * @param merchantId
     * @param operator
     * @return
     */
    int deleteMerchantById(@Param("merchantId") String merchantId);
    /**
     * 编辑状态
     * @param merchantId
     * @param status
     * @return
     */
    int editStatus(@Param("merchantId") String merchantId,@Param("status") String status);
    /**
     * 分页查询便民服务商家 运营后台
     *
     * @param page                      分页参数
     * @param item
     * @return
     */
    IPage<NewFightConvenientMerchant> pageMerchant(@Param("page") Page page,
                                                   @Param("isDel") String isDel,
                                                   @Param("keyword") String keyword,
                                                   @Param("status") String status,
                                                   @Param("communityId") String communityId);
    /**
     * 查询商家信息
     *
     * @param merchantId
     * @return
     */
    NewFightConvenientMerchant selectMerchantById(@Param("merchantId") String merchantId);
    int addData(@Param("item") NewFightConvenientMerchantVO item);
    int editData(@Param("item") NewFightConvenientMerchantVO item);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightShoppingDao.java
New file
@@ -0,0 +1,55 @@
package com.panzhihua.service_dangjian.dao;
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.vos.community.building.NewFightShoppingVO;
import com.panzhihua.service_dangjian.entity.NewFightShopping;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface NewFightShoppingDao extends BaseMapper<NewFightShopping>
{
    /**
     * 列表
     * @param
     * @return
     */
    IPage<NewFightShopping> getList(Page page,
                                           @Param("goodName") String goodName,
                                           @Param("goodType") String goodType,
                                           @Param("id") String id,
                                           @Param("communityId") String communityId);
    /**
     * 详情
     * @param id
     * @return
     */
    NewFightShopping getDetails(@Param("id") String id);
    /**
     * 新增
     * @param
     * @return
     */
    int addData(@Param("item") NewFightShoppingVO item);
    /**
     * 编辑
     * @param item
     * @return
     */
    int editData(@Param("item") NewFightShoppingVO item);
    /**
     * 删除
     * @param id
     * @return
     */
    int expurgateData(@Param("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightShoppingOrderDao.java
New file
@@ -0,0 +1,60 @@
package com.panzhihua.service_dangjian.dao;
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.vos.community.building.NewFightShoppingOrderVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO;
import com.panzhihua.service_dangjian.entity.NewFightShoppingOrder;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface NewFightShoppingOrderDao extends BaseMapper<NewFightShoppingOrder>
{
    /**
     * 列表
     * @param
     * @return
     */
    IPage<NewFightShoppingOrder> getList(Page page,
                                           @Param("userId") String userId,
                                           @Param("goodsId") String goodsId,
                                           @Param("orderNumber") String orderNumber,
                                           @Param("goodName") String goodName,
                                           @Param("name") String name,
                                           @Param("cancelType") String cancelType,
                                           @Param("communityId") String communityId);
    /**
     * 详情
     * @param id
     * @return
     */
    NewFightShoppingOrder getDetails(@Param("id") String id,
                                   @Param("communityId") String communityId);
    /**
     * 新增
     * @param
     * @return
     */
    int addData(@Param("item") NewFightShoppingOrderVO item);
    /**
     * 编辑
     * @param item
     * @return
     */
    int editData(@Param("item") NewFightShoppingOrderVO item);
    /**
     * 删除
     * @param id
     * @return
     */
    int expurgateData(@Param("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightConfig.java
New file
@@ -0,0 +1,58 @@
package com.panzhihua.service_dangjian.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("社区商家配置")
public class NewFightConfig implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "社区id")
    private String communityId;
    @ApiModelProperty(value = "兑换地址")
    private String address;
    @ApiModelProperty(value = "纬度")
    private String lat;
    @ApiModelProperty(value = "经度")
    private String lng;
    @ApiModelProperty(value = "兑换状态(1每天  2周一到周五   3周末)")
    private String businessType;
    @ApiModelProperty(value = "兑换开始时间")
    private String businessStartTime;
    @ApiModelProperty(value = "兑换结束时间")
    private String businessEndTime;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightConvenientMerchant.java
New file
@@ -0,0 +1,97 @@
package com.panzhihua.service_dangjian.entity;
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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * @title: ConvenientMerchantDO
 * 服务商家DO
 * @author: hans
 * @date: 2021/09/16 16:04
 */
@Data
@TableName(value = "new_fight_com_convenient_merchants")
public class NewFightConvenientMerchant implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @ApiModelProperty("商家ID")
    private String id;
    @ApiModelProperty("商家名称")
    private String name;
    @ApiModelProperty("商家logo")
    private String logo;
    @ApiModelProperty("联系人")
    private String contacts;
    @ApiModelProperty("咨询电话")
    private String phone;
    @ApiModelProperty("商家地址")
    private String address;
    @ApiModelProperty("纬度")
    private String lat;
    @ApiModelProperty("经度")
    private String lon;
    @ApiModelProperty("商家详细地址")
    private String detailedAddress;
    @ApiModelProperty("商家介绍")
    private String introduction;
    @ApiModelProperty("是否删除")
    private String isDel;
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
    private Date createdAt;
    @ApiModelProperty("创建人")
    private String createdBy;
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
    private Date updatedAt;
    @ApiModelProperty("商家图片")
    private String imgUrl;
    @ApiModelProperty("1启用   2禁用")
    private String status;
    @ApiModelProperty("营业积分")
    private String businessCredit;
    @ApiModelProperty("社区id")
    private String communityId;
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightShopping.java
New file
@@ -0,0 +1,54 @@
package com.panzhihua.service_dangjian.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("商城商品表")
public class NewFightShopping implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "商品名称")
    private String goodName;
    @ApiModelProperty(value = "商品价格")
    private String goodPrice;
    @ApiModelProperty(value = "商品状态(0下架  1上架)")
    private String goodType;
    @ApiModelProperty(value = "商品封面")
    private String coverImgUrl;
    @ApiModelProperty(value = "商品详情内容")
    private String content;
    @ApiModelProperty(value = "社区id")
    private String communityId;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightShoppingOrder.java
New file
@@ -0,0 +1,93 @@
package com.panzhihua.service_dangjian.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("商城订单表")
public class NewFightShoppingOrder implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "订单号")
    private String orderNumber;
    @ApiModelProperty(value = "商品id")
    private String goodsId;
    @ApiModelProperty(value = "下单人id")
    private String userId;
    @ApiModelProperty(value = "核销状态(0待核销  1已核销  2订单已取消)")
    private String cancelType;
    @ApiModelProperty(value = "核销时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date cancelTime;
    @ApiModelProperty(value = "支付金额")
    private String palyMoney;
    @ApiModelProperty(value = "创建时间(兑换时间)")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date abolishTime;
    @ApiModelProperty(value = "商品名称")
    private String goodName;
    @ApiModelProperty(value = "商品价格")
    private String goodPrice;
    @ApiModelProperty(value = "商品图片")
    private String coverImgUrl;
    @ApiModelProperty(value = "姓名")
    private String name;
    @ApiModelProperty(value = "电话")
    private String phone;
    @ApiModelProperty(value = "社区id")
    private String communityId;
    @ApiModelProperty(value = "兑换地址")
    private String address;
    @ApiModelProperty(value = "纬度")
    private String lat;
    @ApiModelProperty(value = "经度")
    private String lng;
    @ApiModelProperty(value = "兑换状态(1每天  2周一到周五   3周末)")
    private String businessType;
    @ApiModelProperty(value = "兑换开始时间")
    private String businessStartTime;
    @ApiModelProperty(value = "兑换结束时间")
    private String businessEndTime;
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConfigService.java
New file
@@ -0,0 +1,22 @@
package com.panzhihua.service_dangjian.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConfigVO;
import com.panzhihua.service_dangjian.entity.NewFightConfig;
public interface NewFightConfigService extends IService<NewFightConfig>
{
    NewFightConfig getDetails(String id);
    /**
     * 新增
     * @param
     * @return
     */
    R addData(NewFightConfigVO item);
    R editData(NewFightConfigVO item);
    R expurgateData(String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java
New file
@@ -0,0 +1,64 @@
package com.panzhihua.service_dangjian.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
import org.apache.ibatis.annotations.Param;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党组织
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 11:39
 **/
public interface NewFightConvenientMerchantService
{
    /**
     * 删除便民服务商家
     *
     * @param merchantId
     * @param operator
     * @return
     */
    R deleteMerchantById(String merchantId);
    /**
     * 编辑状态
     * @param merchantId
     * @param status
     * @return
     */
    R editStatus(String merchantId,String status);
    /**
     * 分页查询便民服务商家 运营后台
     *
     * @param page                      分页参数
     * @param item
     * @return
     */
    R pageMerchant(int pageNum, int pageSize,
                   String isDel,
                   String keyword,
                   String status,
                   String communityId);
    /**
     * 查询商家信息
     *
     * @param merchantId
     * @return
     */
    NewFightConvenientMerchant selectMerchantById(String merchantId);
    R addData(NewFightConvenientMerchantVO item);
    R editData(NewFightConvenientMerchantVO item);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightShoppingOrderService.java
New file
@@ -0,0 +1,31 @@
package com.panzhihua.service_dangjian.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
import com.panzhihua.service_dangjian.entity.NewFightShoppingOrder;
public interface NewFightShoppingOrderService extends IService<NewFightShoppingOrder>
{
    /**
     * 分页查询
     * @param
     * @return
     */
    R getList(int pageNum,int pageSize,String userId,String goodsId,String orderNumber,
              String goodName,String name,String cancelType,String communityId);
    NewFightShoppingOrder getDetails(String id, String communityId);
    /**
     * 新增
     * @param
     * @return
     */
    R addData(NewFightShoppingOrderVO item);
    R editData(NewFightShoppingOrderVO item);
    R cancelOrder(String orderId,String communityId);
    R expurgateData(String id,String communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightShoppingService.java
New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_dangjian.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.service_dangjian.entity.NewFightShopping;
public interface NewFightShoppingService extends IService<NewFightShopping>
{
    /**
     * 分页查询
     * @param
     * @return
     */
    R getList(int pageNum,int pageSize,
              String goodName, String goodType, String id,String communityId);
    NewFightShopping getDetails(String id);
    /**
     * 新增
     * @param
     * @return
     */
    R addData(NewFightShoppingVO item);
    R editData(NewFightShoppingVO item);
    R expurgateData(String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConfigServiceImpl.java
New file
@@ -0,0 +1,55 @@
package com.panzhihua.service_dangjian.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConfigVO;
import com.panzhihua.service_dangjian.dao.NewFightConfigDao;
import com.panzhihua.service_dangjian.entity.NewFightConfig;
import com.panzhihua.service_dangjian.service.NewFightConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class NewFightConfigServiceImpl extends ServiceImpl<NewFightConfigDao,
        NewFightConfig> implements NewFightConfigService
{
    @Override
    public NewFightConfig getDetails(String id) {
        return baseMapper.getDetails(id);
    }
    @Override
    public R addData(NewFightConfigVO item)
    {
        int num= baseMapper.addData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public R editData(NewFightConfigVO item) {
        int num= baseMapper.editData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public R expurgateData(String id) {
        int num= baseMapper.expurgateData(id);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConvenientMerchantServiceImpl.java
New file
@@ -0,0 +1,77 @@
package com.panzhihua.service_dangjian.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.service_dangjian.dao.NewFightConvenientMerchantDao;
import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
import com.panzhihua.service_dangjian.service.NewFightConvenientMerchantService;
import org.springframework.stereotype.Service;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党组织
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 11:40
 **/
@Service
public class NewFightConvenientMerchantServiceImpl extends ServiceImpl<NewFightConvenientMerchantDao,
        NewFightConvenientMerchant> implements NewFightConvenientMerchantService
{
    @Override
    public R deleteMerchantById(String merchantId) {
        int num=baseMapper.deleteMerchantById(merchantId);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @Override
    public R editStatus(String merchantId, String status) {
        int num=baseMapper.editStatus(merchantId,status);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @Override
    public R pageMerchant(int pageNum, int pageSize, String isDel, String keyword, String status,String communityId)
    {
        Page page = new Page<NewFightConvenientMerchant>(pageNum,pageSize);
        return R.ok(baseMapper.pageMerchant(page,isDel,keyword,status,communityId));
    }
    @Override
    public NewFightConvenientMerchant selectMerchantById(String merchantId)
    {
        return baseMapper.selectMerchantById(merchantId);
    }
    @Override
    public R addData(NewFightConvenientMerchantVO item) {
        int num=baseMapper.addData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @Override
    public R editData(NewFightConvenientMerchantVO item) {
        int num=baseMapper.editData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java
New file
@@ -0,0 +1,169 @@
package com.panzhihua.service_dangjian.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_dangjian.dao.NewFightShoppingOrderDao;
import com.panzhihua.service_dangjian.entity.NewFightShopping;
import com.panzhihua.service_dangjian.entity.NewFightShoppingOrder;
import com.panzhihua.service_dangjian.service.NewFightShoppingOrderService;
import com.panzhihua.service_dangjian.service.NewFightShoppingService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
@Slf4j
@Service
public class NewFightShoppingOrderServiceImpl extends ServiceImpl<NewFightShoppingOrderDao,
        NewFightShoppingOrder> implements NewFightShoppingOrderService
{
    @Resource
    private NewFightShoppingService shoppingService;
    @Override
    public R getList(int pageNum,int pageSize,String userId,String goodsId,String orderNumber,
                     String goodName,String name,String cancelType,String communityId)
    {
        Page page = new Page<NewFightShopping>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,userId,goodsId,orderNumber,goodName,name,cancelType,communityId));
    }
    @Override
    public NewFightShoppingOrder getDetails(String id,String communityId) {
        return baseMapper.getDetails(id,communityId);
    }
    @Override
    public R addData(NewFightShoppingOrderVO item)
    {
        item.setOrderNumber(Snowflake.getId()+"");
//        JinhuiCoinGeneralTable generalTable=tableService.getDetails(item.getUserId());
//        NewFightShopping goods=shoppingService.getDetails(item.getGoodsId());
//
//        int allMoney=0;
//        int getMoney=Integer.valueOf(goods.getGoodPrice());
//
//
//        if(generalTable==null)
//        {
//            return R.fail("金汇币不足!");
//        }
//
//        if(!StringUtils.isEmpty(generalTable.getGoldCoin()))
//        {
//            allMoney=Integer.valueOf(generalTable.getGoldCoin());
//        }
//        if(getMoney>allMoney)
//        {
//            return R.fail("金汇币不足!");
//        }
        item.setCancelType("0");
//        item.setPalyMoney(goods.getGoodPrice());
        int num= baseMapper.addData(item);
        if(num>0)
        {
            //修改个人金汇币总额
//            allMoney=allMoney-getMoney;
//            JinhuiCoinGeneralTableVO generalTableVO=new JinhuiCoinGeneralTableVO();
//            generalTableVO.setId(generalTable.getId());
//            generalTableVO.setGoldCoin(allMoney+"");
//            tableService.editData(generalTableVO);
//
//            //增加兑换记录
//            JinhuiGoldCoinRecordVO recordVO=new JinhuiGoldCoinRecordVO();
//            recordVO.setTitle("兑换商品");
//            recordVO.setType("2");
//            recordVO.setUserId(item.getUserId());
//            recordVO.setGoldCoin(getMoney+"");
//            goldCoinRecordService.addData(recordVO);
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public R editData(NewFightShoppingOrderVO item) {
        int num= baseMapper.editData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public R cancelOrder(String orderId,String communityId)
    {
        NewFightShoppingOrder order=baseMapper.getDetails(orderId,communityId);
        if(!StringUtils.equals("0",order.getCancelType()))
        {
            return R.fail("订单不是待核销状态");
        }
        NewFightShoppingOrderVO orderVO=new NewFightShoppingOrderVO();
        orderVO.setId(orderId);
        orderVO.setCancelType("2");
        orderVO.setAbolishTime(new Date());
        int num=baseMapper.editData(orderVO);
        if(num>0)
        {
//            JinhuiCoinGeneralTable generalTable=tableService.getDetails(order.getUserId());
//
//            int allMoney=0;
//            int getMoney=Integer.valueOf(order.getPalyMoney());
//
//            if(!StringUtils.isEmpty(generalTable.getGoldCoin()))
//            {
//                allMoney=Integer.valueOf(generalTable.getGoldCoin());
//            }
//
//            //修改个人金汇币总额
//            allMoney=allMoney+getMoney;
//            JinhuiCoinGeneralTableVO generalTableVO=new JinhuiCoinGeneralTableVO();
//            generalTableVO.setId(generalTable.getId());
//            generalTableVO.setGoldCoin(allMoney+"");
//            tableService.editData(generalTableVO);
//
//            //增加兑换记录
//            JinhuiGoldCoinRecordVO recordVO=new JinhuiGoldCoinRecordVO();
//            recordVO.setTitle("商品订单取消");
//            recordVO.setType("3");
//            recordVO.setUserId(order.getUserId());
//            recordVO.setGoldCoin(getMoney+"");
//            goldCoinRecordService.addData(recordVO);
            return R.ok();
        }
        return R.fail("取消失败");
    }
    @Override
    public R expurgateData(String id,String communityId)
    {
        NewFightShoppingOrder order=baseMapper.getDetails(id,communityId);
        if(StringUtils.equals("0",order.getCancelType()))
        {
            return R.fail("待核销订单不能删除");
        }
        int num= baseMapper.expurgateData(id);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingServiceImpl.java
New file
@@ -0,0 +1,63 @@
package com.panzhihua.service_dangjian.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.service_dangjian.dao.NewFightShoppingDao;
import com.panzhihua.service_dangjian.entity.NewFightShopping;
import com.panzhihua.service_dangjian.service.NewFightShoppingService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class NewFightShoppingServiceImpl extends ServiceImpl<NewFightShoppingDao,
        NewFightShopping> implements NewFightShoppingService
{
    @Override
    public R getList(int pageNum,int pageSize,String goodName, String goodType, String id,String communityId)
    {
        Page page = new Page<NewFightShopping>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,goodName,goodType,id,communityId));
    }
    @Override
    public NewFightShopping getDetails(String id) {
        return baseMapper.getDetails(id);
    }
    @Override
    public R addData(NewFightShoppingVO item)
    {
        int num= baseMapper.addData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public R editData(NewFightShoppingVO item) {
        int num= baseMapper.editData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public R expurgateData(String id) {
        int num= baseMapper.expurgateData(id);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightComConvenientMerchantsMapper.xml
New file
@@ -0,0 +1,281 @@
<?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_dangjian.dao.NewFightConvenientMerchantDao">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant">
        <id column="id" property="id" />
        <id column="name" property="name" />
        <id column="logo" property="logo" />
        <id column="contacts" property="contacts" />
        <id column="phone" property="phone" />
        <id column="address" property="address" />
        <id column="detailed_address" property="detailedAddress" />
        <id column="lat" property="lat" />
        <id column="lon" property="lon" />
        <id column="introduction" property="introduction" />
        <id column="is_del" property="isDel" />
        <id column="created_at" property="createdAt" />
        <id column="created_by" property="createdBy" />
        <id column="updated_at" property="updatedAt" />
        <id column="img_url" property="imgUrl" />
        <id column="status" property="status" />
        <id column="business_credit" property="businessCredit" />
        <id column="community_id" property="communityId" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <select id="pageMerchant" resultType="com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant">
        SELECT
            id,
            name,
            logo,
            contacts,
            phone,
            address,
            detailed_address,
            lat,
            lon,
            introduction,
            is_del,
            created_at,
            created_by,
            updated_at,
            status,
            business_credit,
            community_id,
            img_url
        FROM  new_fight_com_convenient_merchants ccm
        <where>
            1=1
            <if test="communityId != null and communityId != '' ">
                AND community_id=#{communityId}
            </if>
            <if test="isDel != null and isDel != '' ">
                AND is_del=#{isDel}
            </if>
            <if test="keyword != null and keyword != &quot;&quot;">
                AND (
                ccm.name LIKE CONCAT('%', #{keyword}, '%')
                OR ccm.address LIKE CONCAT('%', #{keyword}, '%')
                OR ccm.phone LIKE CONCAT('%', #{keyword}, '%')
                )
            </if>
            <if test="status != null and status != '' ">
                AND status=#{status}
            </if>
        </where>
        GROUP BY created_at DESC
    </select>
    <select id="selectMerchantById" resultType="com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant">
        SELECT
            id,
            name,
            logo,
            contacts,
            phone,
            address,
            detailed_address,
            lat,
            lon,
            introduction,
            is_del,
            created_at,
            created_by,
            updated_at,
            status,
            business_credit,
            community_id,
            img_url
        FROM  new_fight_com_convenient_merchants ccm
        WHERE ccm.id = #{merchantId}
    </select>
    <update id="deleteMerchantById">
        UPDATE new_fight_com_convenient_merchants
        SET is_del = 1
        WHERE id = #{merchantId}
    </update>
    <update id="editStatus">
        UPDATE new_fight_com_convenient_merchants
        SET status = #{status}
        WHERE id = #{merchantId}
    </update>
    <insert id="addData">
        insert into new_fight_com_convenient_merchants
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                id,
            </if>
            <if test="item.name != null and item.name != '' ">
                `name`,
            </if>
            <if test="item.logo != null and item.logo != '' ">
                logo,
            </if>
            <if test="item.contacts != null and item.contacts != '' ">
                contacts,
            </if>
            <if test="item.phone != null and item.phone != '' ">
                phone,
            </if>
            <if test="item.address != null and item.address != '' ">
                address,
            </if>
            <if test="item.detailedAddress != null and item.detailedAddress != '' ">
                detailed_address,
            </if>
            <if test="item.lat != null and item.lat != '' ">
                lat,
            </if>
            <if test="item.lon != null and item.lon != '' ">
                lon,
            </if>
            <if test="item.introduction != null and item.introduction != '' ">
                introduction,
            </if>
            <if test="item.isDel != null and item.isDel != '' ">
                is_del,
            </if>
            <if test="item.createdBy != null and item.createdBy != '' ">
                created_by,
            </if>
            <if test="item.imgUrl != null and item.imgUrl != '' ">
                img_url,
            </if>
            <if test="item.status != null and item.status != '' ">
                status,
            </if>
            <if test="item.businessCredit != null and item.businessCredit != '' ">
                business_credit,
            </if>
            <if test="item.communityId != null and item.communityId != '' ">
                community_id,
            </if>
            created_at
        </trim>
        values
        <trim prefix="("  suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                #{item.id},
            </if>
            <if test="item.name != null and item.name != '' ">
                #{item.name},
            </if>
            <if test="item.logo != null and item.logo != '' ">
                #{item.logo},
            </if>
            <if test="item.contacts != null and item.contacts != '' ">
                #{item.contacts},
            </if>
            <if test="item.phone != null and item.phone != '' ">
                #{item.phone},
            </if>
            <if test="item.address != null and item.address != '' ">
                #{item.address},
            </if>
            <if test="item.detailedAddress != null and item.detailedAddress != '' ">
                #{item.detailedAddress},
            </if>
            <if test="item.lat != null and item.lat != '' ">
                #{item.lat},
            </if>
            <if test="item.lon != null and item.lon != '' ">
                #{item.lon},
            </if>
            <if test="item.introduction != null and item.introduction != '' ">
                #{item.introduction},
            </if>
            <if test="item.isDel != null and item.isDel != '' ">
                #{item.isDel},
            </if>
            <if test="item.createdBy != null and item.createdBy != '' ">
                #{item.createdBy},
            </if>
            <if test="item.convenientType != null and item.convenientType != '' ">
                #{item.convenientType},
            </if>
            <if test="item.auditType != null and item.auditType != '' ">
                #{item.auditType},
            </if>
            <if test="item.auditOpinion != null and item.auditOpinion != '' ">
                #{item.auditOpinion},
            </if>
            <if test="item.imgUrl != null and item.imgUrl != '' ">
                #{item.imgUrl},
            </if>
            <if test="item.status != null and item.status != '' ">
                #{item.status},
            </if>
            <if test="item.businessCredit != null and item.businessCredit != '' ">
                #{item.businessCredit},
            </if>
            <if test="item.communityId != null and item.communityId != '' ">
                #{item.communityId},
            </if>
            sysdate()
        </trim>
    </insert>
    <update id="editData">
        update new_fight_com_convenient_merchants
        <set>
            <if test="item.id != null and item.id != '' ">
                id=#{item.id},
            </if>
            <if test="item.name != null and item.name != '' ">
                `name`=#{item.name},
            </if>
            <if test="item.logo != null and item.logo != '' ">
                logo=#{item.logo},
            </if>
            <if test="item.contacts != null and item.contacts != '' ">
                contacts=#{item.contacts},
            </if>
            <if test="item.phone != null and item.phone != '' ">
                phone=#{item.phone},
            </if>
            <if test="item.address != null and item.address != '' ">
                address=#{item.address},
            </if>
            <if test="item.detailedAddress != null and item.detailedAddress != '' ">
                detailed_address=#{item.detailedAddress},
            </if>
            <if test="item.lat != null and item.lat != '' ">
                lat=#{item.lat},
            </if>
            <if test="item.lon != null and item.lon != '' ">
                lon=#{item.lon},
            </if>
            <if test="item.introduction != null and item.introduction != '' ">
                introduction=#{item.introduction},
            </if>
            <if test="item.isDel != null and item.isDel != '' ">
                is_del=#{item.isDel},
            </if>
            <if test="item.createdBy != null and item.createdBy != '' ">
                created_by=#{item.createdBy},
            </if>
            <if test="item.imgUrl != null and item.imgUrl != '' ">
                img_url=#{item.imgUrl},
            </if>
            <if test="item.status != null and item.status != '' ">
                status=#{item.status},
            </if>
            <if test="item.businessCredit != null and item.businessCredit != '' ">
                business_credit=#{item.businessCredit},
            </if>
            <if test="item.communityId != null and item.communityId != '' ">
                community_id=#{item.communityId},
            </if>
            updated_at=sysdate()
        </set>
        where id = #{item.id}
    </update>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightCommunityConfigMapper.xml
New file
@@ -0,0 +1,130 @@
<?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_dangjian.dao.NewFightConfigDao">
    <resultMap type="com.panzhihua.service_dangjian.entity.NewFightConfig" id="itemMap">
        <result property="id" column="id" />
        <result property="communityId" column="community_id" />
        <result property="address" column="address" />
        <result property="lat" column="lat" />
        <result property="lng" column="lng" />
        <result property="businessType" column="business_type" />
        <result property="businessStartTime" column="business_start_time" />
        <result property="businessEndTime" column="business_end_time" />
        <result property="creationTime" column="creation_time" />
        <result property="updateTime" column="update_time" />
    </resultMap>
    <select id="getDetails" resultMap="itemMap">
        select
            id,
            community_id,
            address,
            lat,
            lng,
            creation_time,
            update_time,
            business_type,
            business_start_time,
            business_end_time
        from new_fight_community_config
        where community_id=#{communityId}
    </select>
    <insert id="addData">
        insert into new_fight_community_config
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                id,
            </if>
            <if test="item.communityId != null and item.communityId != '' ">
                community_id,
            </if>
            <if test="item.address != null and item.address != '' ">
                address,
            </if>
            <if test="item.lat != null and item.lat != '' ">
                lat,
            </if>
            <if test="item.lng != null and item.lng != '' ">
                lng,
            </if>
            <if test="item.businessType != null and item.businessType != '' ">
                business_type,
            </if>
            <if test="item.businessStartTime != null and item.businessStartTime != '' ">
                business_start_time,
            </if>
            <if test="item.businessEndTime != null and item.businessEndTime != '' ">
                business_end_time,
            </if>
            creation_time
        </trim>
        values
        <trim prefix="("  suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                #{item.id},
            </if>
            <if test="item.communityId != null and item.communityId != '' ">
                #{item.communityId},
            </if>
            <if test="item.address != null and item.address != '' ">
                #{item.address},
            </if>
            <if test="item.lat != null and item.lat != '' ">
                #{item.lat},
            </if>
            <if test="item.lng != null and item.lng != '' ">
                #{item.lng},
            </if>
            <if test="item.businessType != null and item.businessType != '' ">
                #{item.businessType},
            </if>
            <if test="item.businessStartTime != null and item.businessStartTime != '' ">
                #{item.businessStartTime},
            </if>
            <if test="item.businessEndTime != null and item.businessEndTime != '' ">
                #{item.businessEndTime},
            </if>
            sysdate()
        </trim>
    </insert>
    <update id="editData">
        update new_fight_community_config
        <set>
            <if test="item.id != null and item.id != '' ">
                id=#{item.id},
            </if>
            <if test="item.communityId != null and item.communityId != '' ">
                community_id=#{item.communityId},
            </if>
            <if test="item.address != null and item.address != '' ">
                address=#{item.address},
            </if>
            <if test="item.lat != null and item.lat != '' ">
                lat=#{item.lat},
            </if>
            <if test="item.lng != null and item.lng != '' ">
                lng=#{item.lng},
            </if>
            <if test="item.businessType != null and item.businessType != '' ">
                business_type=#{item.businessType},
            </if>
            <if test="item.businessStartTime != null and item.businessStartTime != '' ">
                business_start_time=#{item.businessStartTime},
            </if>
            <if test="item.businessEndTime != null and item.businessEndTime != '' ">
                business_end_time=#{item.businessEndTime},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}
    </update>
    <delete id="expurgateData" parameterType="String">
        delete from new_fight_community_config where community_id=#{communityId}
    </delete>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightShoppingMapper.xml
New file
@@ -0,0 +1,152 @@
<?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_dangjian.dao.NewFightShoppingDao">
    <resultMap type="com.panzhihua.service_dangjian.entity.NewFightShopping" id="itemMap">
        <result property="id" column="id" />
        <result property="goodName" column="good_name" />
        <result property="goodPrice" column="good_price" />
        <result property="goodType" column="good_type" />
        <result property="coverImgUrl" column="cover_img_url" />
        <result property="content" column="content" />
        <result property="communityId" column="community_id" />
        <result property="creationTime" column="creation_time" />
        <result property="updateTime" column="update_time" />
    </resultMap>
    <!-- 分页查询 -->
    <select id="getList" resultMap="itemMap">
        select
            id,
            good_name,
            good_price,
            good_type,
            cover_img_url,
            content,
            community_id,
            creation_time,
            update_time
        from new_fight_shopping
        <where>
            1=1
            <if test="communityId !=null and communityId !='' ">
                and community_id=#{communityId}
            </if>
            <if test="goodName !=null and goodName !='' ">
                and good_name LIKE CONCAT('%', #{goodName}, '%')
            </if>
            <if test="goodType !=null and goodType !='' ">
                and good_type=#{goodType}
            </if>
            <if test="id !=null and id !='' ">
                and id=#{id}
            </if>
        </where>
        order by creation_time desc
    </select>
    <select id="getDetails" resultMap="itemMap">
        select
            id,
            good_name,
            good_price,
            good_type,
            cover_img_url,
            content,
            community_id,
            creation_time,
            update_time
        from new_fight_shopping
        where
            id=#{id}
    </select>
    <insert id="addData">
        insert into new_fight_shopping
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                id,
            </if>
            <if test="item.goodName != null and item.goodName != '' ">
                good_name,
            </if>
            <if test="item.goodPrice != null and item.goodPrice != '' ">
                good_price,
            </if>
            <if test="item.goodType != null and item.goodType != '' ">
                good_type,
            </if>
            <if test="item.coverImgUrl != null and item.coverImgUrl != '' ">
                cover_img_url,
            </if>
            <if test="item.content != null and item.content != '' ">
                content,
            </if>
            <if test="item.communityId !=null and item.communityId !='' ">
                community_id,
            </if>
            creation_time
        </trim>
        values
        <trim prefix="("  suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                #{item.id},
            </if>
            <if test="item.goodName != null and item.goodName != '' ">
                #{item.goodName},
            </if>
            <if test="item.goodPrice != null and item.goodPrice != '' ">
                #{item.goodPrice},
            </if>
            <if test="item.goodType != null and item.goodType != '' ">
                #{item.goodType},
            </if>
            <if test="item.coverImgUrl != null and item.coverImgUrl != '' ">
                #{item.coverImgUrl},
            </if>
            <if test="item.content != null and item.content != '' ">
                #{item.content},
            </if>
            <if test="item.communityId !=null and item.communityId !='' ">
                #{item.communityId},
            </if>
            sysdate()
        </trim>
    </insert>
    <update id="editData">
        update new_fight_shopping
        <set>
            <if test="item.id != null and item.id != '' ">
                id=#{item.id},
            </if>
            <if test="item.goodName != null and item.goodName != '' ">
                good_name=#{item.goodName},
            </if>
            <if test="item.goodPrice != null and item.goodPrice != '' ">
                good_price=#{item.goodPrice},
            </if>
            <if test="item.goodType != null and item.goodType != '' ">
                good_type=#{item.goodType},
            </if>
            <if test="item.coverImgUrl != null and item.coverImgUrl != '' ">
                cover_img_url=#{item.coverImgUrl},
            </if>
            <if test="item.content != null and item.content != '' ">
                content=#{item.content},
            </if>
            <if test="item.communityId !=null and item.communityId !='' ">
                community_id=#{item.communityId},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}
    </update>
    <delete id="expurgateData" parameterType="String">
        delete from new_fight_shopping where id=#{id}
    </delete>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightShoppingOrderMapper.xml
New file
@@ -0,0 +1,212 @@
<?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_dangjian.dao.NewFightShoppingOrderDao">
    <resultMap type="com.panzhihua.service_dangjian.entity.NewFightShoppingOrder" id="itemMap">
        <result property="id" column="id" />
        <result property="orderNumber" column="order_number" />
        <result property="goodsId" column="goods_id" />
        <result property="userId" column="user_id" />
        <result property="cancelType" column="cancel_type" />
        <result property="cancelTime" column=" cancel_time" />
        <result property="palyMoney" column="paly_money" />
        <result property="creationTime" column="creation_time" />
        <result property="updateTime" column="update_time" />
        <result property="abolishTime" column="abolish_time" />
        <result property="communityId" column="community_id" />
    </resultMap>
    <!-- 分页查询 -->
    <select id="getList" resultMap="itemMap">
        select
            jso.id,
            jso.order_number,
            jso.goods_id,
            js.good_name,
            js.good_price,
            js.cover_img_url,
            jso.user_id,
            su.name,
            su.phone,
            vcc.address,
            vcc.lat,
            vcc.lng,
            vcc.business_type,
            vcc.business_start_time,
            vcc.business_end_time,
            jso.creation_time,
            jso.cancel_type,
            jso.update_time,
            jso.cancel_time,
            jso.abolish_time,
            jso.community_id,
            jso.paly_money
        from new_fight_shopping_order as jso
        LEFT JOIN sys_user su ON jso.user_id = su.user_id
        LEFT JOIN new_fight_jinhui_shopping js ON js.id = jso.goods_id
        LEFT JOIN new_fight_community_config as vcc ON vcc.community_id=jso.community_id
        <where>
            1=1
            <if test="communityId !=null and communityId !='' ">
                and jso.community_id=#{communityId}
            </if>
            <if test="userId !=null and userId !='' ">
                and jso.user_id=#{userId}
            </if>
            <if test="goodsId !=null and goodsId !='' ">
                and jso.goods_id=#{goodsId}
            </if>
            <if test="orderNumber !=null and orderNumber !='' ">
                and jso.order_number LIKE CONCAT('%', #{orderNumber}, '%')
            </if>
            <if test="goodName !=null and goodName !='' ">
                and js.good_name LIKE CONCAT('%', #{goodName}, '%')
            </if>
            <if test="name !=null and name !='' ">
                and su.name LIKE CONCAT('%', #{name}, '%')
            </if>
            <if test="cancelType !=null and cancelType !='' ">
                and jso.cancel_type LIKE CONCAT('%', #{cancelType}, '%')
            </if>
        </where>
        order by creation_time desc
    </select>
    <select id="getDetails" resultMap="itemMap">
        select
            jso.id,
            jso.order_number,
            jso.goods_id,
            js.good_name,
            js.good_price,
            js.cover_img_url,
            jso.user_id,
            su.name,
            su.phone,
            vcc.address,
            vcc.lat,
            vcc.lng,
            vcc.business_type,
            vcc.business_start_time,
            vcc.business_end_time,
            jso.creation_time,
            jso.cancel_type,
            jso.update_time,
            jso.cancel_time,
            jso.abolish_time,
            jso.community_id,
            jso.paly_money
        from new_fight_shopping_order as jso
        LEFT JOIN sys_user su ON jso.user_id = su.user_id
        LEFT JOIN jinhui_shopping js ON js.id = jso.goods_id
        LEFT JOIN new_fight_community_config as vcc ON vcc.community_id=jso.community_id
        where
            jso.id=#{id}
    </select>
    <insert id="addData">
        insert into new_fight_shopping_order
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                id,
            </if>
            <if test="item.orderNumber != null and item.orderNumber != '' ">
                order_number,
            </if>
            <if test="item.goodsId != null and item.goodsId != '' ">
                goods_id,
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id,
            </if>
            <if test="item.cancelType != null and item.cancelType != '' ">
                cancel_type,
            </if>
            <if test="item.cancelTime != null ">
                cancel_time,
            </if>
            <if test="item.palyMoney != null and item.palyMoney != '' ">
                paly_money,
            </if>
            <if test="item.abolishTime != null">
                abolish_time,
            </if>
            <if test="item.communityId !=null and item.communityId !='' ">
                community_id,
            </if>
            creation_time
        </trim>
        values
        <trim prefix="("  suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                #{item.id},
            </if>
            <if test="item.orderNumber != null and item.orderNumber != '' ">
                #{item.orderNumber},
            </if>
            <if test="item.goodsId != null and item.goodsId != '' ">
                #{item.goodsId},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                #{item.userId},
            </if>
            <if test="item.cancelType != null and item.cancelType != '' ">
                #{item.cancelType},
            </if>
            <if test="item.cancelTime != null ">
                #{item.cancelTime},
            </if>
            <if test="item.palyMoney != null and item.palyMoney != '' ">
                #{item.palyMoney},
            </if>
            <if test="item.abolishTime != null">
                #{item.abolishTime},
            </if>
            <if test="item.communityId !=null and item.communityId !='' ">
                #{item.communityId}
            </if>
            sysdate()
        </trim>
    </insert>
    <update id="editData">
        update new_fight_shopping_order
        <set>
            <if test="item.id != null and item.id != '' ">
                id=#{item.id},
            </if>
            <if test="item.orderNumber != null and item.orderNumber != '' ">
                order_number=#{item.orderNumber},
            </if>
            <if test="item.goodsId != null and item.goodsId != '' ">
                goods_id=#{item.goodsId},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id=#{item.userId},
            </if>
            <if test="item.cancelType != null and item.cancelType != '' ">
                cancel_type=#{item.cancelType},
            </if>
            <if test="item.cancelTime != null  ">
                cancel_time=#{item.cancelTime},
            </if>
            <if test="item.palyMoney != null and item.palyMoney != '' ">
                paly_money=#{item.palyMoney},
            </if>
            <if test="item.abolishTime != null">
                abolish_time=#{item.abolishTime},
            </if>
            <if test="item.communityId !=null and item.communityId !='' ">
                item.community_id=#{item.communityId}
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}
    </update>
    <delete id="expurgateData" parameterType="String">
        delete from new_fight_shopping_order where id=#{id}
    </delete>
</mapper>