diff --git a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java index e3bcf09..8986708 100644 --- a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java +++ b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java @@ -142,13 +142,11 @@ public class MpWxPayService { request.setTotalFee(price); //总金额|分计 request.setSpbillCreateIp(clientIp); //终端IP request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径 -// request.setNotifyUrl("http://h5.xzaiyp.top/a-notice-api/pay-api/info/notify");//设置回调路径 request.setProductId(productId); //商品id request.setOpenid(openId); //JSAPI OPENID if (dev){ request.setTotalFee(price); request.setNotifyUrl(wxPay.notifyUrlDev); -// request.setNotifyUrl("http://h5.xzaiyp.top/a-notice-api/pay-api/info/notify");//设置回调路径 } try { Object order = wxPayService.createOrder(request); diff --git a/han-hai-module-pay/src/main/resources/pay_weixin.properties b/han-hai-module-pay/src/main/resources/pay_weixin.properties index ee81b4e..ce02ac8 100644 --- a/han-hai-module-pay/src/main/resources/pay_weixin.properties +++ b/han-hai-module-pay/src/main/resources/pay_weixin.properties @@ -5,10 +5,10 @@ #pay.notifyUrl=https://jobadmin.java996.icu/job-dev/job/pay/notify #pay.notifyUrlDev=https://jobadmin.java996.icu/job-dev/job/pay/notify -pay.mchId=1669760259 -pay.appId=wxe934cebcbc89d869 -pay.mchKey=78e4e80a2096b362114a7afeefd2ef24 +pay.mchId=1673516176 +pay.appId=wxa4d29e67e8a58d38 +pay.mchKey=GVIP1008611ABCDEFGGGGJKHLOSJFLGK pay.keyPath=classpath:apiclient_cert.pem -pay.notifyUrl=http://h5.xzaiyp.top/massage-api/post/create -pay.notifyUrlDev=http://h5.xzaiyp.top/massage-api/post/notify +pay.notifyUrl=https://admin.hhlm1688.com/api/order/payNotify +pay.notifyUrlDev=http://h5.xzaiyp.top/api/order/payNotify diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index cc7d138..1b286eb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -72,9 +72,10 @@ public class ShiroConfig { } } filterChainDefinitionMap.put("/web/**", "anon"); //官网接口开放验证 - filterChainDefinitionMap.put("/city/**", "anon"); + filterChainDefinitionMap.put("/order/**", "anon"); filterChainDefinitionMap.put("/login/**", "anon"); filterChainDefinitionMap.put("/token/**", "anon"); + filterChainDefinitionMap.put("/city/**", "anon"); diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/controller/CityAddressController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/controller/CityAddressController.java new file mode 100644 index 0000000..267d689 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/controller/CityAddressController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.cityAddress.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.cityAddress.entity.CityAddress; +import org.jeecg.modules.cityAddress.service.ICityAddressService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 地址信息表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +@Api(tags="地址信息表") +@RestController +@RequestMapping("/cityAddress/cityAddress") +@Slf4j +public class CityAddressController extends JeecgController { + @Autowired + private ICityAddressService cityAddressService; + + /** + * 分页列表查询 + * + * @param cityAddress + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "地址信息表-分页列表查询") + @ApiOperation(value="地址信息表-分页列表查询", notes="地址信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CityAddress cityAddress, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cityAddress, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = cityAddressService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param cityAddress + * @return + */ + @AutoLog(value = "地址信息表-添加") + @ApiOperation(value="地址信息表-添加", notes="地址信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CityAddress cityAddress) { + cityAddressService.save(cityAddress); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param cityAddress + * @return + */ + @AutoLog(value = "地址信息表-编辑") + @ApiOperation(value="地址信息表-编辑", notes="地址信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CityAddress cityAddress) { + cityAddressService.updateById(cityAddress); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "地址信息表-通过id删除") + @ApiOperation(value="地址信息表-通过id删除", notes="地址信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + cityAddressService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "地址信息表-批量删除") + @ApiOperation(value="地址信息表-批量删除", notes="地址信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.cityAddressService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "地址信息表-通过id查询") + @ApiOperation(value="地址信息表-通过id查询", notes="地址信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CityAddress cityAddress = cityAddressService.getById(id); + if(cityAddress==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(cityAddress); + } + + /** + * 导出excel + * + * @param request + * @param cityAddress + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CityAddress cityAddress) { + return super.exportXls(request, cityAddress, CityAddress.class, "地址信息表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CityAddress.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/entity/CityAddress.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/entity/CityAddress.java new file mode 100644 index 0000000..cde7d74 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/entity/CityAddress.java @@ -0,0 +1,82 @@ +package org.jeecg.modules.cityAddress.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 地址信息表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +@Data +@TableName("city_address") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="city_address对象", description="地址信息表") +public class CityAddress implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String name; + /**电话*/ + @Excel(name = "电话", width = 15) + @ApiModelProperty(value = "电话") + private java.lang.String phone; + /**地址*/ + @Excel(name = "地址", width = 15) + @ApiModelProperty(value = "地址") + private java.lang.String address; + /**地址详情*/ + @Excel(name = "地址详情", width = 15) + @ApiModelProperty(value = "地址详情") + private java.lang.String addressDetail; + /**默认*/ + @Excel(name = "默认", width = 15) + @ApiModelProperty(value = "默认") + private java.lang.String defaultFlag; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private java.lang.String latitude; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private java.lang.String longitude; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/mapper/CityAddressMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/mapper/CityAddressMapper.java new file mode 100644 index 0000000..def3dc3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/mapper/CityAddressMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.cityAddress.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.cityAddress.entity.CityAddress; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 地址信息表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +public interface CityAddressMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/mapper/xml/CityAddressMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/mapper/xml/CityAddressMapper.xml new file mode 100644 index 0000000..6f49f1e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/mapper/xml/CityAddressMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/service/ICityAddressService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/service/ICityAddressService.java new file mode 100644 index 0000000..94345b6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/service/ICityAddressService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.cityAddress.service; + +import org.jeecg.modules.cityAddress.entity.CityAddress; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 地址信息表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +public interface ICityAddressService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/service/impl/CityAddressServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/service/impl/CityAddressServiceImpl.java new file mode 100644 index 0000000..8460480 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/service/impl/CityAddressServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.cityAddress.service.impl; + +import org.jeecg.modules.cityAddress.entity.CityAddress; +import org.jeecg.modules.cityAddress.mapper.CityAddressMapper; +import org.jeecg.modules.cityAddress.service.ICityAddressService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 地址信息表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +@Service +public class CityAddressServiceImpl extends ServiceImpl implements ICityAddressService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/CityAddressList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/CityAddressList.vue new file mode 100644 index 0000000..dfa385a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/CityAddressList.vue @@ -0,0 +1,213 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressForm.vue new file mode 100644 index 0000000..c1cdd82 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressForm.vue @@ -0,0 +1,139 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressModal.Style#Drawer.vue new file mode 100644 index 0000000..dcfd864 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressModal.vue new file mode 100644 index 0000000..9cf647f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue/modules/CityAddressModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddress.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddress.api.ts new file mode 100644 index 0000000..4369a89 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddress.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/cityAddress/cityAddress/list', + save='/cityAddress/cityAddress/add', + edit='/cityAddress/cityAddress/edit', + deleteOne = '/cityAddress/cityAddress/delete', + deleteBatch = '/cityAddress/cityAddress/deleteBatch', + importExcel = '/cityAddress/cityAddress/importExcel', + exportXls = '/cityAddress/cityAddress/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddress.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddress.data.ts new file mode 100644 index 0000000..449c07a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddress.data.ts @@ -0,0 +1,93 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '电话', + align:"center", + dataIndex: 'phone' + }, + { + title: '地址', + align:"center", + dataIndex: 'address' + }, + { + title: '地址详情', + align:"center", + dataIndex: 'addressDetail' + }, + { + title: '默认', + align:"center", + dataIndex: 'defaultFlag' + }, + { + title: '经度', + align:"center", + dataIndex: 'latitude' + }, + { + title: '纬度', + align:"center", + dataIndex: 'longitude' + }, + { + title: '用户', + align:"center", + dataIndex: 'userId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '电话', + field: 'phone', + component: 'Input', + }, + { + label: '地址', + field: 'address', + component: 'Input', + }, + { + label: '地址详情', + field: 'addressDetail', + component: 'Input', + }, + { + label: '默认', + field: 'defaultFlag', + component: 'Input', + }, + { + label: '经度', + field: 'latitude', + component: 'Input', + }, + { + label: '纬度', + field: 'longitude', + component: 'Input', + }, + { + label: '用户', + field: 'userId', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddressList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddressList.vue new file mode 100644 index 0000000..6eb1819 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/CityAddressList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/components/CityAddressModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/components/CityAddressModal.vue new file mode 100644 index 0000000..977a637 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAddress/vue3/components/CityAddressModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/controller/CityHomeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/controller/CityHomeController.java index a013a39..bc55814 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/controller/CityHomeController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/controller/CityHomeController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 租房信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-07 * @Version: V1.0 */ @Api(tags="租房信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java index 85dbdca..c1528ac 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 租房信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-07 * @Version: V1.0 */ @Data @@ -72,7 +72,7 @@ public class CityHome implements Serializable { /**租金*/ @Excel(name = "租金", width = 15) @ApiModelProperty(value = "租金") - private java.math.BigDecimal money; + private java.lang.String money; /**面积*/ @Excel(name = "面积", width = 15) @ApiModelProperty(value = "面积") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/mapper/CityHomeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/mapper/CityHomeMapper.java index e943236..ba4af6f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/mapper/CityHomeMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/mapper/CityHomeMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 租房信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-07 * @Version: V1.0 */ public interface CityHomeMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/ICityHomeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/ICityHomeService.java index 9a1b838..0b6796f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/ICityHomeService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/ICityHomeService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 租房信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-07 * @Version: V1.0 */ public interface ICityHomeService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/impl/CityHomeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/impl/CityHomeServiceImpl.java index d69c72c..bd461ed 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/impl/CityHomeServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/impl/CityHomeServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 租房信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-07 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue index 85c5734..2be6799 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue @@ -305,7 +305,7 @@ fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'string',value:'titleSub',text:'备注',dictCode:''}) fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) - fieldList.push({type:'BigDecimal',value:'money',text:'租金',dictCode:''}) + fieldList.push({type:'string',value:'money',text:'租金',dictCode:''}) fieldList.push({type:'string',value:'crm',text:'面积',dictCode:''}) fieldList.push({type:'string',value:'floor',text:'楼层',dictCode:''}) fieldList.push({type:'string',value:'face',text:'朝向',dictCode:''}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue index c01d04a..6116877 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue @@ -30,7 +30,7 @@ - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts index 0dd041a..c82e452 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts @@ -187,7 +187,7 @@ export const formSchema: FormSchema[] = [ { label: '租金', field: 'money', - component: 'InputNumber', + component: 'Input', }, { label: '面积', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java index 7657723..6ca1237 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-08 * @Version: V1.0 */ @Api(tags="工作信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java index 0e7a526..e3b45ba 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-08 * @Version: V1.0 */ @Data @@ -68,9 +68,9 @@ public class CityJob implements Serializable { @Excel(name = "地址", width = 15) @ApiModelProperty(value = "地址") private java.lang.String address; - /**学历要求*/ - @Excel(name = "学历要求", width = 15) - @ApiModelProperty(value = "学历要求") + /**招聘要求*/ + @Excel(name = "招聘要求", width = 15) + @ApiModelProperty(value = "招聘要求") private java.lang.String school; /**岗位详情*/ @Excel(name = "岗位详情", width = 15) @@ -92,4 +92,36 @@ public class CityJob implements Serializable { @Excel(name = "标签列表", width = 15) @ApiModelProperty(value = "标签列表") private java.lang.String iconText; + /**联系人*/ + @Excel(name = "联系人", width = 15) + @ApiModelProperty(value = "联系人") + private java.lang.String userName; + /**联系电话*/ + @Excel(name = "联系电话", width = 15) + @ApiModelProperty(value = "联系电话") + private java.lang.String userPhone; + /**职位描述*/ + @Excel(name = "职位描述", width = 15) + @ApiModelProperty(value = "职位描述") + private java.lang.String jobContext; + /**公司介绍*/ + @Excel(name = "公司介绍", width = 15) + @ApiModelProperty(value = "公司介绍") + private java.lang.String gsContext; + /**招聘公司*/ + @Excel(name = "招聘公司", width = 15) + @ApiModelProperty(value = "招聘公司") + private java.lang.String company; + /**认证情况*/ + @Excel(name = "认证情况", width = 15) + @ApiModelProperty(value = "认证情况") + private java.lang.String isCardOpen; + /**假日福利*/ + @Excel(name = "假日福利", width = 15) + @ApiModelProperty(value = "假日福利") + private java.lang.String iconTitle; + /**所属乡镇*/ + @Excel(name = "所属乡镇", width = 15) + @ApiModelProperty(value = "所属乡镇") + private java.lang.String city; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java index 8b906e4..e329f61 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-08 * @Version: V1.0 */ public interface CityJobMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java index f85493f..151f027 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-08 * @Version: V1.0 */ public interface ICityJobService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java index e7b31f5..b86dc3d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 工作信息表 * @Author: jeecg-boot - * @Date: 2024-10-26 + * @Date: 2024-11-08 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue index 9dc7e00..9f443dc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue @@ -148,7 +148,7 @@ dataIndex: 'address' }, { - title:'学历要求', + title:'招聘要求', align:"center", dataIndex: 'school' }, @@ -177,6 +177,46 @@ align:"center", dataIndex: 'iconText' }, + { + title:'联系人', + align:"center", + dataIndex: 'userName' + }, + { + title:'联系电话', + align:"center", + dataIndex: 'userPhone' + }, + { + title:'职位描述', + align:"center", + dataIndex: 'jobContext' + }, + { + title:'公司介绍', + align:"center", + dataIndex: 'gsContext' + }, + { + title:'招聘公司', + align:"center", + dataIndex: 'company' + }, + { + title:'认证情况', + align:"center", + dataIndex: 'isCardOpen' + }, + { + title:'假日福利', + align:"center", + dataIndex: 'iconTitle' + }, + { + title:'所属乡镇', + align:"center", + dataIndex: 'city' + }, { title: '操作', dataIndex: 'action', @@ -216,12 +256,20 @@ fieldList.push({type:'BigDecimal',value:'minPrice',text:'最低价格',dictCode:''}) fieldList.push({type:'BigDecimal',value:'maxPrice',text:'最高价格',dictCode:''}) fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) - fieldList.push({type:'string',value:'school',text:'学历要求',dictCode:''}) - fieldList.push({type:'string',value:'jobDetails',text:'岗位详情',dictCode:''}) + fieldList.push({type:'Text',value:'school',text:'招聘要求',dictCode:''}) + fieldList.push({type:'Text',value:'jobDetails',text:'岗位详情',dictCode:''}) fieldList.push({type:'string',value:'latitude',text:'经度',dictCode:''}) fieldList.push({type:'string',value:'longitude',text:'纬度',dictCode:''}) fieldList.push({type:'string',value:'workYear',text:'工作年限',dictCode:''}) fieldList.push({type:'string',value:'iconText',text:'标签列表',dictCode:''}) + fieldList.push({type:'string',value:'userName',text:'联系人',dictCode:''}) + fieldList.push({type:'string',value:'userPhone',text:'联系电话',dictCode:''}) + fieldList.push({type:'Text',value:'jobContext',text:'职位描述',dictCode:''}) + fieldList.push({type:'Text',value:'gsContext',text:'公司介绍',dictCode:''}) + fieldList.push({type:'string',value:'company',text:'招聘公司',dictCode:''}) + fieldList.push({type:'string',value:'isCardOpen',text:'认证情况',dictCode:''}) + fieldList.push({type:'string',value:'iconTitle',text:'假日福利',dictCode:''}) + fieldList.push({type:'string',value:'city',text:'所属乡镇',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue index 01ec0f3..9cf1c80 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue @@ -29,8 +29,8 @@ - - + + @@ -58,6 +58,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts index 7bf3072..814aea5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts @@ -30,7 +30,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'address' }, { - title: '学历要求', + title: '招聘要求', align:"center", dataIndex: 'school' }, @@ -59,6 +59,46 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'iconText' }, + { + title: '联系人', + align:"center", + dataIndex: 'userName' + }, + { + title: '联系电话', + align:"center", + dataIndex: 'userPhone' + }, + { + title: '职位描述', + align:"center", + dataIndex: 'jobContext' + }, + { + title: '公司介绍', + align:"center", + dataIndex: 'gsContext' + }, + { + title: '招聘公司', + align:"center", + dataIndex: 'company' + }, + { + title: '认证情况', + align:"center", + dataIndex: 'isCardOpen' + }, + { + title: '假日福利', + align:"center", + dataIndex: 'iconTitle' + }, + { + title: '所属乡镇', + align:"center", + dataIndex: 'city' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -94,9 +134,9 @@ export const formSchema: FormSchema[] = [ component: 'Input', }, { - label: '学历要求', + label: '招聘要求', field: 'school', - component: 'Input', + component: 'InputTextArea',//TODO 注意string转换问题 }, { label: '岗位详情', @@ -123,4 +163,44 @@ export const formSchema: FormSchema[] = [ field: 'iconText', component: 'Input', }, + { + label: '联系人', + field: 'userName', + component: 'Input', + }, + { + label: '联系电话', + field: 'userPhone', + component: 'Input', + }, + { + label: '职位描述', + field: 'jobContext', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '公司介绍', + field: 'gsContext', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '招聘公司', + field: 'company', + component: 'Input', + }, + { + label: '认证情况', + field: 'isCardOpen', + component: 'Input', + }, + { + label: '假日福利', + field: 'iconTitle', + component: 'Input', + }, + { + label: '所属乡镇', + field: 'city', + component: 'Input', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/controller/CityOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/controller/CityOrderController.java new file mode 100644 index 0000000..accd392 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/controller/CityOrderController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.cityOrder.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.cityOrder.entity.CityOrder; +import org.jeecg.modules.cityOrder.service.ICityOrderService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 订单管理 + * @Author: jeecg-boot + * @Date: 2024-11-09 + * @Version: V1.0 + */ +@Api(tags="订单管理") +@RestController +@RequestMapping("/cityOrder/cityOrder") +@Slf4j +public class CityOrderController extends JeecgController { + @Autowired + private ICityOrderService cityOrderService; + + /** + * 分页列表查询 + * + * @param cityOrder + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "订单管理-分页列表查询") + @ApiOperation(value="订单管理-分页列表查询", notes="订单管理-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CityOrder cityOrder, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cityOrder, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = cityOrderService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param cityOrder + * @return + */ + @AutoLog(value = "订单管理-添加") + @ApiOperation(value="订单管理-添加", notes="订单管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CityOrder cityOrder) { + cityOrderService.save(cityOrder); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param cityOrder + * @return + */ + @AutoLog(value = "订单管理-编辑") + @ApiOperation(value="订单管理-编辑", notes="订单管理-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CityOrder cityOrder) { + cityOrderService.updateById(cityOrder); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "订单管理-通过id删除") + @ApiOperation(value="订单管理-通过id删除", notes="订单管理-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + cityOrderService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "订单管理-批量删除") + @ApiOperation(value="订单管理-批量删除", notes="订单管理-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.cityOrderService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "订单管理-通过id查询") + @ApiOperation(value="订单管理-通过id查询", notes="订单管理-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CityOrder cityOrder = cityOrderService.getById(id); + if(cityOrder==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(cityOrder); + } + + /** + * 导出excel + * + * @param request + * @param cityOrder + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CityOrder cityOrder) { + return super.exportXls(request, cityOrder, CityOrder.class, "订单管理"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CityOrder.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/entity/CityOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/entity/CityOrder.java new file mode 100644 index 0000000..a914453 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/entity/CityOrder.java @@ -0,0 +1,106 @@ +package org.jeecg.modules.cityOrder.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 订单管理 + * @Author: jeecg-boot + * @Date: 2024-11-09 + * @Version: V1.0 + */ +@Data +@TableName("city_order") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="city_order对象", description="订单管理") +public class CityOrder implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**商品名称*/ + @Excel(name = "商品名称", width = 15) + @ApiModelProperty(value = "商品名称") + private java.lang.String name; + /**商品图片*/ + @Excel(name = "商品图片", width = 15) + @ApiModelProperty(value = "商品图片") + private java.lang.String image; + /**购买数量*/ + @Excel(name = "购买数量", width = 15) + @ApiModelProperty(value = "购买数量") + private java.lang.Integer num; + /**价格*/ + @Excel(name = "价格", width = 15) + @ApiModelProperty(value = "价格") + private java.math.BigDecimal price; + /**积分*/ + @Excel(name = "积分", width = 15) + @ApiModelProperty(value = "积分") + private java.math.BigDecimal points; + /**类型0积分支付1微信支付*/ + @Excel(name = "类型0积分支付1微信支付", width = 15) + @ApiModelProperty(value = "类型0积分支付1微信支付") + private java.lang.Integer type; + /**状态0待支付1等待发货2待收货3已完成*/ + @Excel(name = "状态0待支付1等待发货2待收货3已完成", width = 15) + @ApiModelProperty(value = "状态0待支付1等待发货2待收货3已完成") + private java.lang.Integer state; + /**关联用户*/ + @Excel(name = "关联用户", width = 15) + @ApiModelProperty(value = "关联用户") + private java.lang.String userId; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String addressName; + /**电话*/ + @Excel(name = "电话", width = 15) + @ApiModelProperty(value = "电话") + private java.lang.String addressPhone; + /**地址*/ + @Excel(name = "地址", width = 15) + @ApiModelProperty(value = "地址") + private java.lang.String addressCity; + /**地址详情*/ + @Excel(name = "地址详情", width = 15) + @ApiModelProperty(value = "地址详情") + private java.lang.String addressDetails; + /**所属商品*/ + @Excel(name = "所属商品", width = 15) + @ApiModelProperty(value = "所属商品") + private java.lang.String shopId; + /**佣金*/ + @Excel(name = "佣金", width = 15) + @ApiModelProperty(value = "佣金") + private java.math.BigDecimal giveMoney; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/mapper/CityOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/mapper/CityOrderMapper.java new file mode 100644 index 0000000..a84e726 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/mapper/CityOrderMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.cityOrder.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.cityOrder.entity.CityOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 订单管理 + * @Author: jeecg-boot + * @Date: 2024-11-09 + * @Version: V1.0 + */ +public interface CityOrderMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/mapper/xml/CityOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/mapper/xml/CityOrderMapper.xml new file mode 100644 index 0000000..3d6ff13 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/mapper/xml/CityOrderMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/ICityOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/ICityOrderService.java new file mode 100644 index 0000000..c8a8793 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/ICityOrderService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.cityOrder.service; + +import org.jeecg.modules.cityOrder.entity.CityOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 订单管理 + * @Author: jeecg-boot + * @Date: 2024-11-09 + * @Version: V1.0 + */ +public interface ICityOrderService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/impl/CityOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/impl/CityOrderServiceImpl.java new file mode 100644 index 0000000..81fb0bb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/service/impl/CityOrderServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.cityOrder.service.impl; + +import org.jeecg.modules.cityOrder.entity.CityOrder; +import org.jeecg.modules.cityOrder.mapper.CityOrderMapper; +import org.jeecg.modules.cityOrder.service.ICityOrderService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 订单管理 + * @Author: jeecg-boot + * @Date: 2024-11-09 + * @Version: V1.0 + */ +@Service +public class CityOrderServiceImpl extends ServiceImpl implements ICityOrderService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/CityOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/CityOrderList.vue new file mode 100644 index 0000000..569557b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/CityOrderList.vue @@ -0,0 +1,249 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderForm.vue new file mode 100644 index 0000000..a63ee05 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderForm.vue @@ -0,0 +1,169 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderModal.Style#Drawer.vue new file mode 100644 index 0000000..f377fd8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderModal.vue new file mode 100644 index 0000000..8e5ade0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue/modules/CityOrderModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrder.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrder.api.ts new file mode 100644 index 0000000..f6086a7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrder.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/cityOrder/cityOrder/list', + save='/cityOrder/cityOrder/add', + edit='/cityOrder/cityOrder/edit', + deleteOne = '/cityOrder/cityOrder/delete', + deleteBatch = '/cityOrder/cityOrder/deleteBatch', + importExcel = '/cityOrder/cityOrder/importExcel', + exportXls = '/cityOrder/cityOrder/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrder.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrder.data.ts new file mode 100644 index 0000000..c0029f1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrder.data.ts @@ -0,0 +1,153 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '商品名称', + align:"center", + dataIndex: 'name' + }, + { + title: '商品图片', + align:"center", + dataIndex: 'image' + }, + { + title: '购买数量', + align:"center", + dataIndex: 'num' + }, + { + title: '价格', + align:"center", + dataIndex: 'price' + }, + { + title: '积分', + align:"center", + dataIndex: 'points' + }, + { + title: '类型0积分支付1微信支付', + align:"center", + dataIndex: 'type' + }, + { + title: '状态0待支付1等待发货2待收货3已完成', + align:"center", + dataIndex: 'state' + }, + { + title: '关联用户', + align:"center", + dataIndex: 'userId' + }, + { + title: '姓名', + align:"center", + dataIndex: 'addressName' + }, + { + title: '电话', + align:"center", + dataIndex: 'addressPhone' + }, + { + title: '地址', + align:"center", + dataIndex: 'addressCity' + }, + { + title: '地址详情', + align:"center", + dataIndex: 'addressDetails' + }, + { + title: '所属商品', + align:"center", + dataIndex: 'shopId' + }, + { + title: '佣金', + align:"center", + dataIndex: 'giveMoney' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '商品名称', + field: 'name', + component: 'Input', + }, + { + label: '商品图片', + field: 'image', + component: 'Input', + }, + { + label: '购买数量', + field: 'num', + component: 'InputNumber', + }, + { + label: '价格', + field: 'price', + component: 'InputNumber', + }, + { + label: '积分', + field: 'points', + component: 'InputNumber', + }, + { + label: '类型0积分支付1微信支付', + field: 'type', + component: 'InputNumber', + }, + { + label: '状态0待支付1等待发货2待收货3已完成', + field: 'state', + component: 'InputNumber', + }, + { + label: '关联用户', + field: 'userId', + component: 'Input', + }, + { + label: '姓名', + field: 'addressName', + component: 'Input', + }, + { + label: '电话', + field: 'addressPhone', + component: 'Input', + }, + { + label: '地址', + field: 'addressCity', + component: 'Input', + }, + { + label: '地址详情', + field: 'addressDetails', + component: 'Input', + }, + { + label: '所属商品', + field: 'shopId', + component: 'Input', + }, + { + label: '佣金', + field: 'giveMoney', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrderList.vue new file mode 100644 index 0000000..2ab3719 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/CityOrderList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/components/CityOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/components/CityOrderModal.vue new file mode 100644 index 0000000..e5a2566 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityOrder/vue3/components/CityOrderModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/controller/CityShoppingController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/controller/CityShoppingController.java new file mode 100644 index 0000000..1af8788 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/controller/CityShoppingController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.cityShopping.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.cityShopping.entity.CityShopping; +import org.jeecg.modules.cityShopping.service.ICityShoppingService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 商城表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +@Api(tags="商城表") +@RestController +@RequestMapping("/cityShopping/cityShopping") +@Slf4j +public class CityShoppingController extends JeecgController { + @Autowired + private ICityShoppingService cityShoppingService; + + /** + * 分页列表查询 + * + * @param cityShopping + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "商城表-分页列表查询") + @ApiOperation(value="商城表-分页列表查询", notes="商城表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CityShopping cityShopping, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cityShopping, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = cityShoppingService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param cityShopping + * @return + */ + @AutoLog(value = "商城表-添加") + @ApiOperation(value="商城表-添加", notes="商城表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CityShopping cityShopping) { + cityShoppingService.save(cityShopping); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param cityShopping + * @return + */ + @AutoLog(value = "商城表-编辑") + @ApiOperation(value="商城表-编辑", notes="商城表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CityShopping cityShopping) { + cityShoppingService.updateById(cityShopping); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "商城表-通过id删除") + @ApiOperation(value="商城表-通过id删除", notes="商城表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + cityShoppingService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "商城表-批量删除") + @ApiOperation(value="商城表-批量删除", notes="商城表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.cityShoppingService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "商城表-通过id查询") + @ApiOperation(value="商城表-通过id查询", notes="商城表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CityShopping cityShopping = cityShoppingService.getById(id); + if(cityShopping==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(cityShopping); + } + + /** + * 导出excel + * + * @param request + * @param cityShopping + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CityShopping cityShopping) { + return super.exportXls(request, cityShopping, CityShopping.class, "商城表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CityShopping.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java new file mode 100644 index 0000000..098305b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java @@ -0,0 +1,102 @@ +package org.jeecg.modules.cityShopping.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 商城表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +@Data +@TableName("city_shopping") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="city_shopping对象", description="商城表") +public class CityShopping implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**商品名称*/ + @Excel(name = "商品名称", width = 15) + @ApiModelProperty(value = "商品名称") + private java.lang.String name; + /**商品介绍*/ + @Excel(name = "商品介绍", width = 15) + @ApiModelProperty(value = "商品介绍") + private java.lang.String nameSub; + /**主图*/ + @Excel(name = "主图", width = 15) + @ApiModelProperty(value = "主图") + private java.lang.String image; + /**详情图*/ + @Excel(name = "详情图", width = 15) + @ApiModelProperty(value = "详情图") + private java.lang.String imageDetails; + /**原价*/ + @Excel(name = "原价", width = 15) + @ApiModelProperty(value = "原价") + private java.math.BigDecimal oldPrice; + /**价格*/ + @Excel(name = "价格", width = 15) + @ApiModelProperty(value = "价格") + private java.math.BigDecimal price; + /**积分*/ + @Excel(name = "积分", width = 15) + @ApiModelProperty(value = "积分") + private java.math.BigDecimal points; + /**详情*/ + @Excel(name = "详情", width = 15) + @ApiModelProperty(value = "详情") + private java.lang.String details; + /**购买数量*/ + @Excel(name = "购买数量", width = 15) + @ApiModelProperty(value = "购买数量") + private java.lang.Integer payNum; + /**库存*/ + @Excel(name = "库存", width = 15) + @ApiModelProperty(value = "库存") + private java.lang.Integer num; + /**是否上架*/ + @Excel(name = "是否上架", width = 15) + @ApiModelProperty(value = "是否上架") + private java.lang.String isOpen; + /**关联店铺*/ + @Excel(name = "关联店铺", width = 15, dictTable = "city_shop", dicText = "title", dicCode = "id") + @Dict(dictTable = "city_shop", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联店铺") + private java.lang.String shopId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/CityShoppingMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/CityShoppingMapper.java new file mode 100644 index 0000000..77dc948 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/CityShoppingMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.cityShopping.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.cityShopping.entity.CityShopping; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 商城表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +public interface CityShoppingMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/xml/CityShoppingMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/xml/CityShoppingMapper.xml new file mode 100644 index 0000000..f8a8d6e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/xml/CityShoppingMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/ICityShoppingService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/ICityShoppingService.java new file mode 100644 index 0000000..b60ce18 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/ICityShoppingService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.cityShopping.service; + +import org.jeecg.modules.cityShopping.entity.CityShopping; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 商城表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +public interface ICityShoppingService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/impl/CityShoppingServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/impl/CityShoppingServiceImpl.java new file mode 100644 index 0000000..ee47d41 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/impl/CityShoppingServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.cityShopping.service.impl; + +import org.jeecg.modules.cityShopping.entity.CityShopping; +import org.jeecg.modules.cityShopping.mapper.CityShoppingMapper; +import org.jeecg.modules.cityShopping.service.ICityShoppingService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 商城表 + * @Author: jeecg-boot + * @Date: 2024-11-08 + * @Version: V1.0 + */ +@Service +public class CityShoppingServiceImpl extends ServiceImpl implements ICityShoppingService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/CityShoppingList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/CityShoppingList.vue new file mode 100644 index 0000000..c4f5c1c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/CityShoppingList.vue @@ -0,0 +1,256 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingForm.vue new file mode 100644 index 0000000..ca656d6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingForm.vue @@ -0,0 +1,159 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingModal.Style#Drawer.vue new file mode 100644 index 0000000..d9e5cb6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingModal.vue new file mode 100644 index 0000000..02f313f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.api.ts new file mode 100644 index 0000000..c2b714a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/cityShopping/cityShopping/list', + save='/cityShopping/cityShopping/add', + edit='/cityShopping/cityShopping/edit', + deleteOne = '/cityShopping/cityShopping/delete', + deleteBatch = '/cityShopping/cityShopping/deleteBatch', + importExcel = '/cityShopping/cityShopping/importExcel', + exportXls = '/cityShopping/cityShopping/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.data.ts new file mode 100644 index 0000000..2186272 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.data.ts @@ -0,0 +1,159 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '创建人', + align:"center", + dataIndex: 'createBy' + }, + { + title: '创建日期', + align:"center", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '商品名称', + align:"center", + dataIndex: 'name' + }, + { + title: '商品介绍', + align:"center", + dataIndex: 'nameSub' + }, + { + title: '主图', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '详情图', + align:"center", + dataIndex: 'imageDetails', + customRender:render.renderAvatar, + }, + { + title: '原价', + align:"center", + dataIndex: 'oldPrice' + }, + { + title: '价格', + align:"center", + dataIndex: 'price' + }, + { + title: '积分', + align:"center", + dataIndex: 'points' + }, + { + title: '详情', + align:"center", + dataIndex: 'details', + slots: { customRender: 'htmlSlot' }, + }, + { + title: '购买数量', + align:"center", + dataIndex: 'payNum' + }, + { + title: '库存', + align:"center", + dataIndex: 'num' + }, + { + title: '是否上架', + align:"center", + dataIndex: 'isOpen', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '关联店铺', + align:"center", + dataIndex: 'shopId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '商品名称', + field: 'name', + component: 'Input', + }, + { + label: '商品介绍', + field: 'nameSub', + component: 'Input', + }, + { + label: '主图', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '详情图', + field: 'imageDetails', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '原价', + field: 'oldPrice', + component: 'InputNumber', + }, + { + label: '价格', + field: 'price', + component: 'InputNumber', + }, + { + label: '积分', + field: 'points', + component: 'InputNumber', + }, + { + label: '详情', + field: 'details', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '购买数量', + field: 'payNum', + component: 'InputNumber', + }, + { + label: '库存', + field: 'num', + component: 'InputNumber', + }, + { + label: '是否上架', + field: 'isOpen', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '关联店铺', + field: 'shopId', + component: 'JSearchSelect', + componentProps:{ + dict:"city_shop,title,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShoppingList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShoppingList.vue new file mode 100644 index 0000000..916d9a6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShoppingList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/components/CityShoppingModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/components/CityShoppingModal.vue new file mode 100644 index 0000000..ddedef3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/components/CityShoppingModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java index 6d4bc74..5c4a076 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -53,6 +54,13 @@ public class AppletLoginServiceImpl implements AppletLoginService { */ @Transactional(rollbackFor = {Exception.class}) public Result appletLogin( LoginReq loginReq) { + //传入数据： + log.info("小程序登录参数：{}", loginReq); + //传入邀请者标识 + log.info("小程序邀请者标识：" + loginReq.getShareId()); + + + Result result = new Result<>(); Map map = new HashMap<>(); if (StringUtils.isBlank(loginReq.getCode())) { @@ -77,6 +85,9 @@ public class AppletLoginServiceImpl implements AppletLoginService { member.setAppletOpenid(wxOpenid); member.setNickName("瑶都墙友"+System.currentTimeMillis()); member.setHeadImage(loginReq.getHeadimgurl()); + member.setShareId(loginReq.getShareId()); + member.setVtime(new Date()); + member.setVid(loginReq.getVid()); // 生成token返回给小程序端 String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid); memberService.save(member); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/YaoDuOrderBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/YaoDuOrderBean.java new file mode 100644 index 0000000..ad87876 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/YaoDuOrderBean.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.api.bean; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class YaoDuOrderBean { + + /**显示条数*/ + @ApiModelProperty(value = "显示条数" ) + private Integer pageSize; + /**当前页*/ + @ApiModelProperty(value = "当前页" ) + private Integer pageNo; + + public YaoDuOrderBean() { + this.pageNo = 1; + this.pageSize = 1000; + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java index 0567f4d..14b4fa5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java @@ -5,6 +5,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.citiyShopAuthentication.entity.CitiyShopAuthentication; import org.jeecg.modules.citiyUserAuthentication.entity.CitiyUserAuthentication; +import org.jeecg.modules.cityAddress.entity.CityAddress; import org.jeecg.modules.cityCat.entity.CityCat; import org.jeecg.modules.cityComment.entity.CityComment; import org.jeecg.modules.cityHome.entity.CityHome; @@ -174,5 +175,23 @@ public interface YaoDuApiService { //获取活动类型 Result getActivityType(); + //查询商城信息列表带分页 + Result getShopPingPage(PageBean pageBean); + + //根据商品标识查询商品信息详情 + Result getShoppingDetail(String id); + + //获取用户地址信息列表 + Result getAddressList(String token,PageBean pageBean); + + //获取用户地址信息详情 + Result getAddressDetail(String token,String id); + + //添加用户地址信息 + Result addOrEditAddress(String token, CityAddress address); + + //删除地址信息 + Result deleteAddress(String token,String addressId); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java new file mode 100644 index 0000000..a8a9a88 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.api.service; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.YaoDuOrderBean; + +public interface YaoDuOrderService { + + + //商城-立即兑换商品 + Result createPointsOrder(String token,String shopId,Integer num,String addressId); + + //商城-立即购买商品 + Result createOrder(String token,String shopId,Integer num,String addressId); + + //商城-订单列表 + Result getOrderList(String token,YaoDuOrderBean bean); + + //商城-订单详情 + Result getOrderDetail(String token,String orderId); + + //商城-支付回调 + Result payNotify(String requestBody); +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java index 2bef0dd..9124d67 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java @@ -39,6 +39,8 @@ import org.jeecg.modules.cityAdd.entity.CityAdd; import org.jeecg.modules.cityAdd.service.ICityAddService; import org.jeecg.modules.cityAddr.entity.CityAddr; import org.jeecg.modules.cityAddr.service.ICityAddrService; +import org.jeecg.modules.cityAddress.entity.CityAddress; +import org.jeecg.modules.cityAddress.service.ICityAddressService; import org.jeecg.modules.cityAddressLog.service.ICityAddressLogService; import org.jeecg.modules.cityBanner.entity.CityBanner; import org.jeecg.modules.cityBanner.service.ICityBannerService; @@ -62,6 +64,8 @@ import org.jeecg.modules.cityMember.service.ICityMemberService; import org.jeecg.modules.cityPhoneLog.service.ICityPhoneLogService; import org.jeecg.modules.cityShop.entity.CityShop; import org.jeecg.modules.cityShop.service.ICityShopService; +import org.jeecg.modules.cityShopping.entity.CityShopping; +import org.jeecg.modules.cityShopping.service.ICityShoppingService; import org.jeecg.modules.cityTrends.entity.CityTrends; import org.jeecg.modules.cityTrends.service.ICityTrendsService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -143,6 +147,12 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { //获取配置信息 @Resource private ICityConfService cityConfService; + //获取商城列表 + @Resource + private ICityShoppingService cityShoppingService; + //获取地址信息列表 + @Resource + private ICityAddressService cityAddressService; //获取景点信息 @Resource private ICityJdService cityJdService; @@ -1215,4 +1225,69 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { List list = cityActivityTypeService.list(); return Result.OK(list); } + + + + //查询商城信息列表带分页 + @Override + public Result getShopPingPage(PageBean pageBean){ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = cityShoppingService.lambdaQuery() + .page(page); + //获取列表数据循环替换数据 + List records = page1.getRecords(); + //创建一个新的集合 + List newRecords = new ArrayList<>(); + for (CityShopping record : records) { + record.setShopId(cityShopService.getById(record.getShopId()).getTitle()); + newRecords.add(record); + } + page1.setRecords(newRecords); + return Result.OK(page1); + } + + + //根据商品标识查询商品信息详情 + @Override + public Result getShoppingDetail(String id){ + CityShopping cityShopping = cityShoppingService.getById(id); + return Result.OK(cityShopping); + } + + + + //获取用户地址信息列表 + @Override + public Result getAddressList(String token,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = cityAddressService.lambdaQuery() + .page(page); + + return Result.OK(page1); + } + + //获取用户地址信息详情 + @Override + public Result getAddressDetail(String token,String id){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CityAddress address1 = cityAddressService.getById(id); + return Result.OK(address1); + } + + //添加用户地址信息 + @Override + public Result addOrEditAddress(String token, CityAddress address){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + cityAddressService.saveOrUpdate(address); + return Result.OK(); + } + + //删除地址信息 + @Override + public Result deleteAddress(String token,String id){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + cityAddressService.removeById(id); + return Result.OK(); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java new file mode 100644 index 0000000..309e98c --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java @@ -0,0 +1,200 @@ +package org.jeecg.modules.api.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; +import lombok.extern.log4j.Log4j; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.api.bean.YaoDuOrderBean; +import org.jeecg.modules.api.service.YaoDuOrderService; +import org.jeecg.modules.cityAddress.entity.CityAddress; +import org.jeecg.modules.cityAddress.service.ICityAddressService; +import org.jeecg.modules.cityOrder.entity.CityOrder; +import org.jeecg.modules.cityOrder.service.ICityOrderService; +import org.jeecg.modules.cityShopping.entity.CityShopping; +import org.jeecg.modules.cityShopping.service.ICityShoppingService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.pay.MpWxPayService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Date; + + +@Log4j2 +@Service +public class YaoDuOrderServiceImpl implements YaoDuOrderService { + + //获取商城信息 + @Resource + private ICityShoppingService cityShoppingService; + //权限配置 + @Resource + private ShiroRealm shiroRealm; + //支付接口 + @Autowired + private MpWxPayService mpWxPayService; + //订单 + @Resource + private ICityOrderService cityOrderService; + //地址 + @Resource + private ICityAddressService cityAddressService; + + + + + //商城-立即兑换商品 + @Override + public Result createPointsOrder(String token,String shopId,Integer num,String addressId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //商品标识不能为空 + if(StringUtils.isNotBlank(shopId)){ + return Result.error("商品标识不能为空"); + } + //商品数量不能为空，并且不能小于零 + if(num!=null && num<0){ + return Result.error("商品数量不能小于零"); + } + //用户地址不能为空 + if(StringUtils.isNotBlank(addressId)){ + return Result.error("请选择收货地址"); + } + //根据商品标识查询商品是否存在 + CityShopping cityShopping = cityShoppingService.getById(shopId); + if(null==cityShopping){ + return Result.error("商品不存在"); + } + //根据商品标识查询地址是否存在 + CityAddress cityAddress = cityAddressService.getById(addressId); + if(null==cityAddress){ + return Result.error("地址不存在"); + } + //创建订单 + BigDecimal price = cityShopping.getPrice().multiply(new BigDecimal(num)); + //积分 + BigDecimal points = cityShopping.getPoints().multiply(new BigDecimal(num)); + + CityOrder cityOrder = new CityOrder(); + cityOrder.setUserId(hanHaiMember.getId()); + cityOrder.setShopId(shopId); + cityOrder.setNum(num); + cityOrder.setAddressCity(cityAddress.getAddress()); + cityOrder.setAddressName(cityAddress.getName()); + cityOrder.setAddressPhone(cityAddress.getPhone()); + cityOrder.setAddressDetails(cityAddress.getAddressDetail()); + cityOrder.setName(cityShopping.getName()); + cityOrder.setPrice(price); + cityOrder.setPoints(points); + cityOrder.setImage(cityShopping.getImage()); + cityOrder.setState(0); + cityOrder.setType(0); //积分兑换 + cityOrder.setCreateTime(new Date()); + cityOrderService.save(cityOrder); + + //判断积分是否大于所需积分 + if(hanHaiMember.getIntegerPrice().compareTo(points)<=0){ + return Result.error("积分不足"); + } + + //积分不足 + return Result.error("积分不足"); + } + + //商城-立即购买商品 + @Override + public Result createOrder(String token,String shopId,Integer num,String addressId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //商品标识不能为空 + if(StringUtils.isNotBlank(shopId)){ + return Result.error("商品标识不能为空"); + } + //商品数量不能为空，并且不能小于零 + if(num!=null && num<0){ + return Result.error("商品数量不能小于零"); + } + //用户地址不能为空 + if(StringUtils.isNotBlank(addressId)){ + return Result.error("请选择收货地址"); + } + //根据商品标识查询商品是否存在 + CityShopping cityShopping = cityShoppingService.getById(shopId); + if(null==cityShopping){ + return Result.error("商品不存在"); + } + //根据商品标识查询地址是否存在 + CityAddress cityAddress = cityAddressService.getById(addressId); + if(null==cityAddress){ + return Result.error("地址不存在"); + } + //创建订单 + BigDecimal price = cityShopping.getPrice().multiply(new BigDecimal(num)); + //积分 + BigDecimal points = cityShopping.getPoints().multiply(new BigDecimal(num)); + + CityOrder cityOrder = new CityOrder(); + cityOrder.setUserId(hanHaiMember.getId()); + cityOrder.setShopId(shopId); + cityOrder.setNum(num); + cityOrder.setAddressCity(cityAddress.getAddress()); + cityOrder.setAddressName(cityAddress.getName()); + cityOrder.setAddressPhone(cityAddress.getPhone()); + cityOrder.setAddressDetails(cityAddress.getAddressDetail()); + cityOrder.setName(cityShopping.getName()); + cityOrder.setPrice(price); + cityOrder.setPoints(points); + cityOrder.setImage(cityShopping.getImage()); + cityOrder.setState(0); + cityOrder.setType(1); //微信支付 + cityOrder.setCreateTime(new Date()); + cityOrderService.save(cityOrder); + + //吊起微信支付 + String s = price.multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrderGo( + "购买"+ cityShopping.getName() , + "127.0.0.1", + cityOrder.getId(), + i1, + cityOrder.getId(), + hanHaiMember.getAppletOpenid(), + cityOrder.toString()); + + return Result.OK("支付成功",appOrder); + } + + //商城-订单列表 + @Override + public Result getOrderList(String token, YaoDuOrderBean bean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(bean.getPageNo(), bean.getPageSize()); + Page page1 = cityOrderService.lambdaQuery() + .page(page); + return Result.OK(page1); + } + + //商城-订单详情 + @Override + public Result getOrderDetail(String token,String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + CityOrder cityOrder = cityOrderService.getById(orderId); + return Result.OK(cityOrder); + } + + + //商城-支付回调 + @Override + public Result payNotify(String requestBody){ + WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody); + String outTradeNo = notify.getOutTradeNo(); + log.info("支付回调订单号码："+outTradeNo); + + return null; + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiController.java index 74eaec4..e288cf0 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiController.java @@ -242,4 +242,19 @@ public class YaoDuApiController { public Result getActivityType() { return yaoDuApiService.getActivityType(); } + + + //查询商城信息列表带分页 + @ApiOperation(value="查询商城信息列表带分页") + @GetMapping(value = "/getShopPingPage") + public Result getShopPingPage(PageBean pageBean) { + return yaoDuApiService.getShopPingPage(pageBean); + } + + //根据商品标识查询商品信息详情 + @ApiOperation(value="根据商品标识查询商品信息详情") + @GetMapping(value = "/getShopPingDetail") + public Result getShopPingDetail(String id) { + return yaoDuApiService.getShoppingDetail(id); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java index 622277e..3f987f0 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java @@ -8,6 +8,7 @@ import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.api.service.YaoDuApiService; import org.jeecg.modules.citiyShopAuthentication.entity.CitiyShopAuthentication; import org.jeecg.modules.citiyUserAuthentication.entity.CitiyUserAuthentication; +import org.jeecg.modules.cityAddress.entity.CityAddress; import org.jeecg.modules.cityCat.entity.CityCat; import org.jeecg.modules.cityComment.entity.CityComment; import org.jeecg.modules.cityHome.entity.CityHome; @@ -173,4 +174,42 @@ public class YaoDuApiTokenController { } + //获取用户地址信息列表 + @ApiOperation(value="获取用户地址信息列表") + @GetMapping("/getAddressList") + public Result getAddressList(@RequestHeader("X-Access-Token") String token,PageBean pageBean) + { + return yaoDuApiService.getAddressList(token,pageBean); + } + + //获取地址信息列表详情 + @ApiOperation(value="获取地址信息列表详情") + @GetMapping("/getAddressDetail") + public Result getAddressDetail(@RequestHeader("X-Access-Token") String token,String addressId) + { + return yaoDuApiService.getAddressDetail(token,addressId); + } + + //增加或者编辑地址信息 + @ApiOperation(value="增加或者编辑地址信息") + @PostMapping("/addOrEditAddress") + public Result addOrEditAddress(@RequestHeader("X-Access-Token") String token, CityAddress address) + { + return yaoDuApiService.addOrEditAddress(token,address); + } + + + //删除地址信息 + @ApiOperation(value="删除地址信息") + @PostMapping("/deleteAddress") + public Result deleteAddress(@RequestHeader("X-Access-Token") String token,String addressId) + { + return yaoDuApiService.deleteAddress(token,addressId); + } + + + + + + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java new file mode 100644 index 0000000..2304fe1 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java @@ -0,0 +1,65 @@ +package org.jeecg.modules.api.yaoduapi; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.bean.YaoDuOrderBean; +import org.jeecg.modules.api.service.YaoDuOrderService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags="商城模块相关接口") +@RestController +@RequestMapping("/order") +@Slf4j +public class YaoDuOrderController { + + + @Resource + private YaoDuOrderService yaoDuOrderService; + + + + //商城-立即兑换商品 + @ApiOperation(value="商城-立即兑换商品", notes="商城-立即兑换商品") + @PostMapping("/createPointsOrder") + public Result createPointsOrder(@RequestHeader("X-Access-Token") String token,String shopId,Integer num,String addressId) + { + return yaoDuOrderService.createPointsOrder(token,shopId,num,addressId); + } + + + //商城-立即购买商品 + @ApiOperation(value="商城-立即兑换商品", notes="商城-立即兑换商品") + @PostMapping("/createOrder") + public Result createOrder(@RequestHeader("X-Access-Token") String token,String shopId,Integer num,String addressId){ + return yaoDuOrderService.createOrder(token,shopId,num,addressId); + } + + //商城-订单列表 + @ApiOperation(value="商城-订单列表", notes="商城-订单列表") + @PostMapping("/getOrderList") + public Result getOrderList(@RequestHeader("X-Access-Token") String token, YaoDuOrderBean bean){ + return yaoDuOrderService.getOrderList(token,bean); + } + + //商城-订单详情 + @ApiOperation(value="商城-订单详情", notes="商城-订单详情") + @GetMapping("/getOrderDetail") + public Result getOrderDetail(@RequestHeader("X-Access-Token") String token,String orderId){ + return yaoDuOrderService.getOrderDetail(token,orderId); + } + + //商城-支付回调 + @ApiOperation(value="商城-支付回调", notes="商城-支付回调") + @PostMapping("/payNotify") + public Result payNotify(@RequestBody String requestBody){ + return yaoDuOrderService.payNotify(requestBody); + } + + + +}