From 9e2b9068a2f5e79c15ef00027c45a6893066a953 Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Wed, 8 Nov 2023 18:08:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/views/integral/gift/index.vue | 6 +- .../src/views/integral/order/detail.vue | 94 ++++++-- .../src/views/integral/order/outcome.vue | 201 ++++++++++++++++++ .../views/integral/order/pointsCashier.vue | 93 ++++++-- .../src/views/integral/order/pointsMall.vue | 181 ++++++++++++---- .../controller/IntegralOrdersController.java | 21 +- .../integral/dto/IntegralOrdersDTO.java | 17 ++ .../integral/entity/IntegralOrders.java | 8 + .../integral/mapper/IntegralOrdersMapper.java | 6 +- .../mapper/xml/IntegralOrdersMapper.xml | 68 ++++-- .../service/IntegralOrdersService.java | 3 +- .../impl/IntegralOrdersServiceImpl.java | 8 +- 12 files changed, 596 insertions(+), 110 deletions(-) create mode 100644 fuintAdmin/src/views/integral/order/outcome.vue create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java diff --git a/fuintAdmin/src/views/integral/gift/index.vue b/fuintAdmin/src/views/integral/gift/index.vue index 456e68406..2eb32bba8 100644 --- a/fuintAdmin/src/views/integral/gift/index.vue +++ b/fuintAdmin/src/views/integral/gift/index.vue @@ -766,9 +766,6 @@ export default { }, submitForm: function() { - console.log("dataForm",this.dataForm) - console.log("dialogImageUrl",this.giftImages) - let this_ = this if (Array.isArray(this_.giftImages)) { this_.dataForm.giftImages = JSON.stringify(this_.giftImages); @@ -858,6 +855,7 @@ export default { }, // 修改按钮 handleUpdate(data) { + let fileList = JSON.parse(data.giftImages); this.giftImages = [], @@ -869,6 +867,7 @@ export default { let sp = image.url.split('//') image.url = this.imagePath + '/'+sp[2] }) + console.log("data",data.deliveryMethod); data.deliveryMethod = JSON.parse(data.deliveryMethod); @@ -1073,7 +1072,6 @@ export default { }, // 上传详情图 handleUploadSuccessGift(file) { - console.log("aaa",file) let newImage = { name: file.data.original, url: process.env.VUE_APP_SERVER_URL + file.data.fileName, diff --git a/fuintAdmin/src/views/integral/order/detail.vue b/fuintAdmin/src/views/integral/order/detail.vue index 8561a3820..640081b9b 100644 --- a/fuintAdmin/src/views/integral/order/detail.vue +++ b/fuintAdmin/src/views/integral/order/detail.vue @@ -1,43 +1,90 @@ diff --git a/fuintAdmin/src/views/integral/order/pointsMall.vue b/fuintAdmin/src/views/integral/order/pointsMall.vue index 6a51a6dc0..06703b808 100644 --- a/fuintAdmin/src/views/integral/order/pointsMall.vue +++ b/fuintAdmin/src/views/integral/order/pointsMall.vue @@ -5,23 +5,48 @@ - - + + + + + + + + + + + + 搜索 重置 @@ -29,29 +54,23 @@ - - - - - - + - - 待处理/待发货 + + 待处理/待发货 - - 已完成/已发货 + + 已完成/已发货 - - 已拒绝/已退款 + + 已拒绝/已退款 - + - - + + + - + + + - - + + + + + - - + + + + + @@ -134,56 +183,106 @@ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java index aca5c0f61..e16ad79b7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java @@ -2,6 +2,7 @@ package com.fuint.business.integral.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.integral.dto.IntegralOrdersDTO; import com.fuint.business.integral.entity.IntegralOrders; import com.fuint.business.integral.service.IntegralOrdersService; import com.fuint.business.integral.vo.IntegralOrdersVO; @@ -39,7 +40,7 @@ public class IntegralOrdersController extends BaseController { @GetMapping("queryByPage") public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, - @Param("integralOrders") IntegralOrders integralOrders) { + @Param("integralOrders") IntegralOrdersDTO integralOrders) { Page page = new Page(pageNo, pageSize); IPage integralOrdersIPage = this.integralOrdersService.queryByPage(page, integralOrders); return getSuccessResult(integralOrdersIPage); @@ -64,7 +65,7 @@ public class IntegralOrdersController extends BaseController { * @return 新增结果 */ @PostMapping - public ResponseObject add(IntegralOrders integralOrders) { + public ResponseObject add(@RequestBody IntegralOrders integralOrders) { return getSuccessResult(this.integralOrdersService.insert(integralOrders)); } @@ -75,10 +76,20 @@ public class IntegralOrdersController extends BaseController { * @return 编辑结果 */ @PutMapping - public ResponseObject edit(IntegralOrders integralOrders) { + public ResponseObject edit(@RequestBody IntegralOrders integralOrders) { return getSuccessResult(this.integralOrdersService.update(integralOrders)); } +// /** +// * 处理发货 修改该快递单号 +// * @param integralOrders +// * @return +// */ +// @PutMapping +// public ResponseObject editExpressDelivery(IntegralOrders integralOrders) { +// return getSuccessResult(this.integralOrdersService.update(integralOrders)); +// } + /** * 删除数据 * @@ -91,6 +102,10 @@ public class IntegralOrdersController extends BaseController { } + /** + * 统计数据 + * @return + */ @GetMapping("/statistics") public ResponseObject statistics() { return getSuccessResult(this.integralOrdersService.statistics()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java new file mode 100644 index 000000000..403be312c --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java @@ -0,0 +1,17 @@ +package com.fuint.business.integral.dto; + + +import com.fuint.business.integral.entity.IntegralOrders; +import lombok.Data; + +/** + * 查询参数 + */ +@Data +public class IntegralOrdersDTO extends IntegralOrders { + private String mobile; + private String userNo; + private String name; + private String giftName; + private String coverImage; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralOrders.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralOrders.java index 7c910d7a1..cdbed27e8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralOrders.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralOrders.java @@ -79,6 +79,14 @@ public class IntegralOrders extends BaseEntity { * 店铺ID */ private Integer storeId; + /** + * 快递公司 + */ + private String courierCompanies; + /** + * 快递号 + */ + private String theTrackingNumber; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java index 72a808722..dfd95b1ae 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java @@ -2,10 +2,12 @@ package com.fuint.business.integral.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.integral.dto.IntegralOrdersDTO; import com.fuint.business.integral.entity.IntegralGift; import com.fuint.business.integral.entity.IntegralOrders; import com.fuint.business.integral.vo.IntegralGiftVO; import com.fuint.business.integral.vo.IntegralOrdersVO; +import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; import java.util.List; @@ -34,7 +36,7 @@ public interface IntegralOrdersMapper { * @param page 分页对象 * @return 对象列表 */ - IPage queryAllByLimit(@Param("page") Page page, @Param("integralOrders") IntegralOrders integralOrders); + IPage queryAllByLimit(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders); /** * 统计总行数 @@ -89,7 +91,7 @@ public interface IntegralOrdersMapper { * 统计数据 * @return */ - Map statistics(); + Map statistics(@Param("storeId") Integer storeId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml index 31e9e723b..6f7a08232 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml @@ -18,6 +18,8 @@ + + @@ -61,6 +63,8 @@ io.store_id, io.create_time, io.update_time, + io.courier_companies, + io.the_tracking_number, mu.mobile, mu.user_no, mu.name, @@ -70,27 +74,47 @@ left join mt_user mu ON io.user_id = mu.id left join integral_gift ig ON io.gift_id = ig.id + io.store_id = #{integralOrders.storeId} + + + and ig.gift_name like CONCAT ('%',#{integralOrders.giftName},'%') + + + and mu.mobile like CONCAT ('%',#{integralOrders.mobile},'%') + + + and date_format(io.create_time,'%y%m%d') >= date_format(#{integralOrders.params.beginTime},'%y%m%d') + + + and date_format(io.create_time,'%y%m%d') <= date_format(#{integralOrders.params.endTime},'%y%m%d') + + + and io.order_number like CONCAT ('%',#{integralOrders.orderNumber},'%') + + + and io.shipping_type = #{integralOrders.shippingType} + + + and ( + (#{integralOrders.orderStatus} = 1 and (io.order_status = '待处理' or io.order_status = '待发货')) or + (#{integralOrders.orderStatus} = 2 and (io.order_status = '已完成' or io.order_status = '已发货')) or + (#{integralOrders.orderStatus} = 3 and (io.order_status = '已退款' or io.order_status = '已拒绝')) or + (#{integralOrders.orderStatus} = 4 and io.order_status = '未支付') + ) + and io.id = #{integralOrders.id} and io.user_id = #{integralOrders.userId} - - and io.order_number = #{integralOrders.orderNumber} - and io.gift_id = #{integralOrders.giftId} - - and io.shipping_type = #{integralOrders.shippingType} - and io.exchange_quantity = #{integralOrders.exchangeQuantity} - - and io.order_status = #{integralOrders.orderStatus} - + and io.status = #{integralOrders.status} @@ -100,9 +124,6 @@ and io.processing_result = #{integralOrders.processingResult} - - and io.store_id = #{integralOrders.storeId} - and io.create_time = #{integralOrders.createTime} @@ -180,9 +201,15 @@ @@ -276,11 +303,8 @@ from integral_orders store_id = #{storeId}, - - create_time = #{createTime}, - - update_time = #{updateTime}, + update_time = NOW(), create_by = #{createBy}, @@ -288,6 +312,12 @@ from integral_orders update_by = #{updateBy}, + + courier_companies = #{courierCompanies}, + + + the_tracking_number = #{theTrackingNumber}, + where id = #{id} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java index 838f8e4f1..227621b2d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java @@ -2,6 +2,7 @@ package com.fuint.business.integral.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.integral.dto.IntegralOrdersDTO; import com.fuint.business.integral.entity.IntegralOrders; import com.fuint.business.integral.vo.IntegralOrdersVO; import org.apache.ibatis.annotations.Param; @@ -31,7 +32,7 @@ public interface IntegralOrdersService { * @param page 分页对象 * @return 查询结果 */ - IPage queryByPage(@Param("page") Page page, @Param("integralGift") IntegralOrders integralOrders); + IPage queryByPage(@Param("page") Page page, @Param("integralGift") IntegralOrdersDTO integralOrders); /** * 新增数据 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java index d1baea233..4762eeac8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java @@ -1,6 +1,7 @@ package com.fuint.business.integral.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.fuint.business.integral.dto.IntegralOrdersDTO; import com.fuint.business.integral.entity.IntegralGift; import com.fuint.business.integral.entity.IntegralOrders; import com.fuint.business.integral.mapper.IntegralOrdersMapper; @@ -49,7 +50,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { * @return 查询结果 */ @Override - public IPage queryByPage(@Param("page") Page page, @Param("integralOrders") IntegralOrders integralOrders) { + public IPage queryByPage(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); integralOrders.setStoreId(nowAccountInfo.getStoreId()); return integralOrdersDao.queryAllByLimit(page, integralOrders); @@ -74,6 +75,8 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { */ @Override public IntegralOrders update(IntegralOrders integralOrders) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + integralOrders.setUpdateBy(nowAccountInfo.getStaffId().toString()); this.integralOrdersDao.update(integralOrders); return this.queryById(integralOrders.getId()); } @@ -91,6 +94,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { @Override public Map statistics() { - return this.integralOrdersDao.statistics(); + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + return this.integralOrdersDao.statistics(nowAccountInfo.getStoreId()); } }