修正

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/OrderStatusEnum.java

@@ -7,6 +7,7 @@ public enum OrderStatusEnum {
     NOPAY("待付款"),
     DQR("待确认"),
     DJH("待拣货"),
+    JHZ("拣货中"),
     DFH("待发货"),
     YFH("已发货"),
     DPS("待配送"),

mall-server-api/src/main/java/com/gree/mall/manager/bean/third/ThirdPartyVO.java

@@ -0,0 +1,48 @@
+package com.gree.mall.manager.bean.third;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.material.StateEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class ThirdPartyVO {
+
+
+    @ZfireField(hide = true)
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @ApiModelProperty(value = "网址名称")
+    private String urlName;
+
+    @ApiModelProperty(value = "链接")
+    private String url;
+
+    @ApiModelProperty(value = "说明")
+    private String remark;
+
+    @ApiModelProperty(value = "状态")
+    private StateEnum status;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -3,6 +3,7 @@ package com.gree.mall.manager.commonmapper;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.admin.AdminCompanyPayConfigVO;
 import com.gree.mall.manager.bean.charging.ChargingStandardBean;
 import com.gree.mall.manager.bean.common.AmityUrlVO;
 import com.gree.mall.manager.bean.goods.*;
@@ -437,6 +438,13 @@ public interface CommonMapper {
      */
     IPage<GoodsLibraryVO> goodsLibraryList(Page page,@Param("ex") ZfireParamBean zfireParamBean);
 
+    /**
+     * 商户支付配置
+     * @param page
+     * @param zfireParamBean
+     * @return
+     */
+    IPage<AdminCompanyPayConfigVO> adminCompanyPayConfigList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     /**
      * 维修日结银行账户列表

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/ThirdPartyCMapper.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.commonmapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.third.ThirdPartyVO;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import org.apache.ibatis.annotations.Param;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ThirdPartyCMapper {
+
+    IPage<ThirdPartyVO> page(Page page, @Param("ex") ZfireParamBean zfireParam, @Param("companyWechatIds") List<String> companyWechatIds);
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminCompanyPayConfigController.java

@@ -0,0 +1,71 @@
+package com.gree.mall.manager.controller.admin;
+
+import cn.hutool.core.lang.TypeReference;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.annotation.ZfireList;
+import com.gree.mall.manager.bean.admin.AdminCompanyPayConfigVO;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.helper.ResponseHelper;
+import com.gree.mall.manager.logic.admin.AdminCompanyPayConfigLogic;
+import com.gree.mall.manager.plus.entity.AdminCompanyWechatPayConfig;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+@Api(value = "商户支付配置", tags = {"商户支付配置"})
+@RequestMapping(value = "/admin/company/pay/config", produces = "application/json; charset=utf-8")
+public class AdminCompanyPayConfigController {
+
+    @Resource
+    AdminCompanyPayConfigLogic adminCompanyPayConfigLogic;
+
+    @ZfireList
+    @PostMapping("/list")
+    @ApiOperation(value = "列表")
+    public ResponseHelper<Page<AdminCompanyPayConfigVO>> list(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) {
+        IPage<AdminCompanyPayConfigVO> vo = adminCompanyPayConfigLogic.list(zfireParamBean);
+        return ResponseHelper.success(vo, new TypeReference<AdminCompanyPayConfigVO>() {});
+    }
+
+    @PostMapping("/list/export")
+    @ApiOperation(value = "导出")
+    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<AdminCompanyPayConfigVO> page = adminCompanyPayConfigLogic.list(zfireParamBean);
+        //3.导出
+        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
+    @PostMapping("/detail")
+    @ApiOperation(value = "详情")
+    public ResponseHelper<AdminCompanyWechatPayConfig> detail(
+            @ApiParam(value = "id", required = true) @RequestParam String id
+    ) throws RemoteServiceException {
+        AdminCompanyWechatPayConfig bean = adminCompanyPayConfigLogic.detail(id);
+        return ResponseHelper.success(bean);
+    }
+
+    @PostMapping("/save")
+    @ApiOperation(value = "保存")
+    public ResponseHelper save(
+            @RequestBody AdminCompanyWechatPayConfig bean
+    ) throws Exception {
+
+        adminCompanyPayConfigLogic.save(bean);
+
+        return ResponseHelper.success();
+    }
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/notice/MiniNoticeController.java

@@ -0,0 +1,53 @@
+package com.gree.mall.manager.controller.notice;
+
+
+import com.gree.mall.manager.helper.ResponseHelper;
+import com.gree.mall.manager.logic.notice.MiniNoticeLogic;
+import com.gree.mall.manager.plus.entity.MiniNotice;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Slf4j
+@RestController
+@Api(value = "提醒通知接口" ,tags = {"提醒通知接口"})
+@RequestMapping(value = "/notice/mini" ,produces = "application/json; charset=utf-8")
+public class MiniNoticeController {
+
+    @Resource
+    MiniNoticeLogic miniNoticeLogic;
+
+    @PostMapping("/add")
+    @ApiOperation(value = "新增")
+    public ResponseHelper add(
+            HttpServletRequest request,
+            @ApiParam(value = "notice",required = true) @RequestBody MiniNotice miniNotice) {
+        miniNoticeLogic.add(request,miniNotice);
+        return ResponseHelper.success();
+    }
+
+    @PostMapping("/update")
+    @ApiOperation(value = "修改")
+    public ResponseHelper update(
+            @ApiParam(value = "notice",required = true) @RequestBody MiniNotice miniNotice) {
+        miniNoticeLogic.update(miniNotice);
+        return ResponseHelper.success();
+    }
+
+    @GetMapping("/select")
+    @ApiOperation(value = "查询")
+    public ResponseHelper<List<MiniNotice>> select(HttpServletRequest request){
+        List<MiniNotice> list = miniNoticeLogic.select(request);
+        return ResponseHelper.success(list);
+    }
+
+
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/third/ThirdPartyController.java

@@ -0,0 +1,98 @@
+package com.gree.mall.manager.controller.third;
+
+import cn.hutool.core.lang.TypeReference;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gree.mall.manager.annotation.ZfireList;
+import com.gree.mall.manager.bean.third.ThirdPartyVO;
+import com.gree.mall.manager.helper.ResponseHelper;
+import com.gree.mall.manager.logic.third.ThirdPartyLogic;
+import com.gree.mall.manager.plus.entity.ThirdParty;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+
+@Slf4j
+@RestController
+@Api(value = "第三方网址", tags = {"第三方网址"})
+@RequestMapping(value = "/thirdPart", produces = "application/json; charset=utf-8")
+public class ThirdPartyController {
+
+    @Autowired
+    private ThirdPartyLogic thirdPartyLogic;
+
+    @ZfireList
+    @PostMapping("/list/page")
+    @ApiOperation(value = "第三方网址列表")
+    public ResponseHelper<IPage<ThirdPartyVO>> pageSettlementV2(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) {
+        IPage<ThirdPartyVO> page = thirdPartyLogic.page(zfireParamBean);
+        return ResponseHelper.success(page, new TypeReference<ThirdPartyVO>() {});
+    }
+
+    @PostMapping("/pageExport")
+    @ApiOperation(value = "第三方网址导出")
+    public void pageSettlementExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<ThirdPartyVO> page = thirdPartyLogic.page(zfireParamBean);
+        //3.导出
+        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
+
+    @PostMapping("/detail")
+    @ApiOperation("第三方网址详情")
+    public ResponseHelper<ThirdParty> detail(
+            @ApiParam(value = "第三方网址id" , required = true) @RequestParam(required = true) String id,
+
+            HttpServletRequest request
+    ) throws ParseException {
+        ThirdParty  thirdParty = thirdPartyLogic.detail(id);
+        return ResponseHelper.success(thirdParty);
+    }
+
+
+
+    @PostMapping("/add")
+    @ApiOperation("添加第三方网址详情")
+    public ResponseHelper add(
+            @RequestBody ThirdParty thirdParty,
+            HttpServletRequest request
+    ) throws ParseException {
+        thirdPartyLogic.add(thirdParty);
+        return ResponseHelper.success();
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("修改第三方网址详情")
+    public ResponseHelper update(
+            @RequestBody ThirdParty thirdParty,
+            HttpServletRequest request
+    ) throws ParseException {
+        thirdPartyLogic.update(thirdParty);
+        return ResponseHelper.success();
+    }
+
+
+    @PostMapping("/del")
+    @ApiOperation("删除第三方网址详情")
+    public ResponseHelper del(
+            @ApiParam(value = "第三方网址id" , required = true) @RequestParam(required = true) String id,
+            HttpServletRequest request
+    ) throws ParseException {
+        thirdPartyLogic.del(id);
+        return ResponseHelper.success();
+    }
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/enums/OrderStatusEnum.java

@@ -10,6 +10,7 @@ public enum OrderStatusEnum {
     NOPAY("待付款"),
     DQR("待确认"),
     DJH("待拣货"),
+    JHZ("拣货中"),
     DFH("待发货"),
     DPS("待配送"),
     PSZ("配送中"),

mall-server-api/src/main/java/com/gree/mall/manager/logic/StorageLogic.java

@@ -225,7 +225,7 @@ public class StorageLogic {
     }
 
     public void initCompanyAccountAndStorageRela(String companyWechatId, List<String> storageIds, String adminUserId) {
-        if (StringUtils.isNotBlank(companyWechatId)) {
+        if (StringUtils.isBlank(companyWechatId)) {
             throw new RemoteServiceException("商户编号不能为空");
         }
         if (CollectionUtil.isEmpty(storageIds)) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminCompanyPayConfigLogic.java

@@ -0,0 +1,127 @@
+package com.gree.mall.manager.logic.admin;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.admin.AdminCompanyPayConfigVO;
+import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.commonmapper.CommonMapper;
+import com.gree.mall.manager.enums.admin.AdminWebsitTypeEnum;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
+import com.gree.mall.manager.plus.entity.AdminCompanyWechatPayConfig;
+import com.gree.mall.manager.plus.entity.AdminWebsit;
+import com.gree.mall.manager.plus.service.AdminCompanyWechatPayConfigService;
+import com.gree.mall.manager.plus.service.AdminWebsitService;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AdminCompanyPayConfigLogic {
+
+    private final CommonMapper commonMapper;
+    private final CommonLogic commonLogic;
+    private final AdminCompanyWechatPayConfigService adminCompanyWechatPayConfigService;
+    private final AdminWebsitService adminWebsitService;
+
+
+    public IPage<AdminCompanyPayConfigVO> list(ZfireParamBean zfireParamBean) {
+        FieldUtils.supplyParam(zfireParamBean, AdminCompanyPayConfigVO.class, commonLogic.getAdminUser());
+        IPage<AdminCompanyPayConfigVO> page = commonMapper.adminCompanyPayConfigList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
+
+        return page;
+    }
+
+    public AdminCompanyWechatPayConfig detail(String id) {
+        return adminCompanyWechatPayConfigService.getById(id);
+    }
+
+    @Transactional
+    public void save(AdminCompanyWechatPayConfig bean) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        AdminCompanyWechat companyWechat = adminUser.getAdminCompanyWechat();
+
+        if (Objects.nonNull(companyWechat)) {
+            bean.setCompanyWechatId(companyWechat.getCompanyWechatId());
+            bean.setCompanyName(companyWechat.getCompanyName());
+        }
+
+        if (StringUtils.isBlank(bean.getPayMerchantName())) {
+            throw new RemoteServiceException("电子商户名称不能为空");
+        }
+
+        if (StringUtils.isBlank(bean.getAttr())) {
+            throw new RemoteServiceException("商户属性不能为空");
+        }
+
+        if (StringUtils.isBlank(bean.getAppId())) {
+            throw new RemoteServiceException("appid不能为空");
+        }
+
+        if (StringUtils.isBlank(bean.getMchId())) {
+            throw new RemoteServiceException("mchid不能为空");
+        }
+
+        if (StringUtils.isBlank(bean.getSubMchId())) {
+            throw new RemoteServiceException("子商户mchid不能为空");
+        }
+
+        if (StringUtils.isBlank(bean.getSubAppId())) {
+            throw new RemoteServiceException("子商户appid不能为空");
+        }
+
+        if (StringUtils.isBlank(bean.getMchKey())) {
+            throw new RemoteServiceException("key不能为空");
+        }
+
+        if (Objects.isNull(bean.getStatus())) {
+            throw new RemoteServiceException("请选择状态");
+        }
+
+        if (StringUtils.isBlank(bean.getAppletAppid())) {
+            throw new RemoteServiceException("小程序appid为空");
+        }
+
+        if (StringUtils.isBlank(bean.getAppletSecret())) {
+            throw new RemoteServiceException("小程序密钥不能为空");
+        }
+
+        if (StringUtils.isNotBlank(bean.getId())) {
+            final AdminCompanyWechatPayConfig old = adminCompanyWechatPayConfigService.getById(bean.getId());
+            if (!old.getAttr().equals(bean.getAttr())) {
+                // 商户属性有变动，清除网点已选的记录
+                if (!bean.getAttr().contains("电子支付")) {
+//                    adminWebsitService.lambdaUpdate()
+//                            .set(AdminWebsit::getPayWorkerCodeId, null)
+//                            .eq(AdminWebsit::getPayWorkerCodeId, bean.getId())
+//                            .eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
+//                            .update();
+                }
+                if (!bean.getAttr().contains("保险支付")) {
+//                    adminWebsitService.lambdaUpdate()
+//                            .set(AdminWebsit::getPayInsureCodeId, null)
+//                            .eq(AdminWebsit::getPayInsureCodeId, bean.getId())
+//                            .eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
+//                            .update();
+                }
+            }
+        }
+
+        if (StringUtils.isBlank(bean.getId())) {
+            bean.setId(IdWorker.getIdStr());
+        }
+
+        bean.insertOrUpdate();
+
+    }
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/notice/MiniNoticeLogic.java

@@ -0,0 +1,96 @@
+package com.gree.mall.manager.logic.notice;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.plus.entity.MiniNotice;
+import com.gree.mall.manager.plus.service.MiniNoticeService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+
+@Component
+public class MiniNoticeLogic {
+    @Autowired
+    private MiniNoticeService miniNoticeService;
+
+    @Autowired
+    CommonLogic commonLogic;
+
+    /**
+     * 新增
+     * @param miniNotice
+     */
+    public void add(HttpServletRequest request,MiniNotice miniNotice){
+        //获取当前登录企业微信id
+        AdminUserCom adminUser = commonLogic.getAdminUser(request);
+        if(StringUtils.isBlank(adminUser.getCompanyWechatId())){
+            throw new RemoteServiceException("非租户账号不可操作当前信息");
+        }
+
+
+        Date createDate = new Date();
+        miniNotice.setCreateTime(createDate);
+        miniNotice.setCompanyWechatId(adminUser.getCompanyWechatId());
+        miniNotice.setCompanyName(adminUser.getCompanyName());
+        miniNoticeService.save(miniNotice);
+    }
+
+    /**
+     * 修改
+     * @param miniNotice
+     */
+    public void update(MiniNotice miniNotice){
+        miniNoticeService.updateById(miniNotice);
+    }
+
+
+    /**
+     * 查询
+     * @return
+     */
+    public List<MiniNotice> select(HttpServletRequest request){
+        //获取当前登录企业微信id
+        AdminUserCom adminUser = commonLogic.getAdminUser(request);
+        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+
+
+        List<MiniNotice> list = miniNoticeService.lambdaQuery()
+                .in(CollectionUtils.isNotEmpty(companyWechatIds),MiniNotice::getCompanyWechatId,companyWechatIds)
+                .list();
+        return list;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/third/ThirdPartyLogic.java

@@ -0,0 +1,65 @@
+package com.gree.mall.manager.logic.third;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.bean.third.ThirdPartyVO;
+import com.gree.mall.manager.bean.websit.SettlementOrderLogicVO;
+import com.gree.mall.manager.commonmapper.ThirdPartyCMapper;
+import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.plus.entity.ThirdParty;
+import com.gree.mall.manager.plus.service.ThirdPartyService;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class ThirdPartyLogic {
+
+    @Autowired
+    ThirdPartyCMapper thirdPartyCMapper;
+
+    @Autowired
+    CommonLogic commonLogic;
+
+    @Autowired
+    ThirdPartyService thirdPartyService;
+
+
+    public IPage<ThirdPartyVO> page(ZfireParamBean zfireParamBean) {
+
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, SettlementOrderLogicVO.class);
+        IPage<ThirdPartyVO> settlementOrderLogicVOIPage = thirdPartyCMapper.page(new Page(zfireParamBean.getPageNum(),
+                        zfireParamBean.getPageSize()),
+                zfireParam
+                , companyWechatIds);
+
+        return settlementOrderLogicVOIPage;
+    }
+
+    public ThirdParty detail(String id) {
+        ThirdParty thirdParty = thirdPartyService.getById(id);
+        return thirdParty;
+    }
+
+    public void add(ThirdParty thirdParty) {
+        thirdParty.insert();
+    }
+
+    public void update(ThirdParty thirdParty) {
+        thirdParty.updateById();
+    }
+
+    public void del(String id) {
+        thirdPartyService.removeById(id);
+    }
+}

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1084,5 +1084,18 @@
             AND a.mobile LIKE CONCAT('%', #{mobile},'%')
         </if>
     </select>
+    <select id="adminCompanyPayConfigList"
+            resultType="com.gree.mall.manager.bean.admin.AdminCompanyPayConfigVO">
+        SELECT
+        ${ex.selected}
+        FROM
+        admin_company_wechat_pay_config a
+        ${ex.query}
+        AND a.del = 0
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
 
 </mapper>

mall-server-api/src/main/resources/mapper/ThirdPartyCMapper.xml

@@ -0,0 +1,17 @@
+<?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.gree.mall.manager.commonmapper.ThirdPartyCMapper">
+
+    <select id="page" resultType="com.gree.mall.manager.bean.third.ThirdPartyVO">
+        select
+        ${ex.selected}
+        from
+        third_party a
+        ${ex.query}
+
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            order by a.create_time desc
+        </if>
+        ${ex.orderBy}
+    </select>
+</mapper>