diff --git a/.gitignore b/.gitignore index a2a3040..6376fdf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ HELP.md target/ +/logs/ !.mvn/wrapper/maven-wrapper.jar !**/src/main/** !**/src/test/** diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java index 688db34..893d695 100644 --- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java +++ b/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java @@ -76,4 +76,12 @@ public class EquipmentRecord implements Serializable { @TableField(exist = false) private String nickname; + @ApiModelProperty(value = "用户真实名称") + @TableField(exist = false) + private String realName; + + @ApiModelProperty(value = "设备的使用时间,精确到0.1天") + @TableField(exist = false) + private Float duration; + } diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml index 7213717..d37ea66 100644 --- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml +++ b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml @@ -6,7 +6,7 @@ SELECT a.*, b.merchant_name,b.merchant_code, - c.nickname,c.user_id + c.nickname,c.user_id,c.real_name FROM apps_equipment_record a LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code LEFT JOIN sys_user c ON a.user_id = c.user_id diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java index 153194a..1e9a44e 100644 --- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java +++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java @@ -5,11 +5,15 @@ import com.gxwebsoft.apps.mapper.EquipmentRecordMapper; import com.gxwebsoft.apps.service.EquipmentRecordService; import com.gxwebsoft.apps.entity.EquipmentRecord; import com.gxwebsoft.apps.param.EquipmentRecordParam; +import com.gxwebsoft.common.core.utils.LocalDateUtil; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; import org.springframework.stereotype.Service; +import java.time.Duration; +import java.time.LocalDateTime; import java.util.List; +import static com.gxwebsoft.apps.constants.EquipmentConstants.EVENT_TYPE_UNBIND; /** * 前世今生Service实现 @@ -25,6 +29,28 @@ public class EquipmentRecordServiceImpl extends ServiceImpl page = new PageParam<>(param); page.setDefaultOrder("create_time desc"); List list = baseMapper.selectPageRel(page, param); + + //计算换电记录中的设备使用时间，这里的数量不多，可以在每次查询过程中计算 + if (!list.isEmpty() && param.getUserId()!=0 && param.getOrderId()!=0) {//如果是换电记录中的查询 + if (list.size() == 1){//如果记录只有一条 + EquipmentRecord equipmentRecord = list.get(0); + LocalDateTime startTime = LocalDateUtil.date2LocalDateTime(equipmentRecord.getCreateTime()); + Duration duration = Duration.between(startTime, LocalDateTime.now()); + equipmentRecord.setDuration(Float.parseFloat(String.format("%.1f",duration.toHours()/24.0f))); + } else {//记录有多条 + EquipmentRecord lastUnbindRecord = null; + for (EquipmentRecord record : list) { + if (record.getEventType().equals(EVENT_TYPE_UNBIND)) {//先找到解绑记录 + lastUnbindRecord = record; + } else if (lastUnbindRecord != null && record.getEquipmentCode().equals(lastUnbindRecord.getEquipmentCode())) {//再往下找相同订单的 + LocalDateTime startTime = LocalDateUtil.date2LocalDateTime(record.getCreateTime()); + LocalDateTime endTime = LocalDateUtil.date2LocalDateTime(lastUnbindRecord.getCreateTime()); + Duration duration = Duration.between(startTime, endTime); + lastUnbindRecord.setDuration(Float.parseFloat(String.format("%.1f",duration.toHours()/24.0f))); + } + } + } + } return new PageResult<>(list, page.getTotal()); } diff --git a/src/main/java/com/gxwebsoft/apps/task/OrderTask.java b/src/main/java/com/gxwebsoft/apps/task/OrderTask.java index d6dac77..53016fa 100644 --- a/src/main/java/com/gxwebsoft/apps/task/OrderTask.java +++ b/src/main/java/com/gxwebsoft/apps/task/OrderTask.java @@ -344,6 +344,10 @@ public class OrderTask { Equipment equipment = equipmentMap.get(order.getEquipmentId()); // 投资人收益 String orderNo = order.getOrderNo(); + String equipmentCode = ""; + if(null != equipment) { + equipment.getEquipmentCode(); + } if (touziProfit.compareTo(BigDecimal.ZERO) > 0 && equipment!= null) { User touziUser = touziUserMap.get(equipment.getTouziUserId()); @@ -359,6 +363,7 @@ public class OrderTask { profitLog.setOrderId(order.getId()); profitLog.setOrderNo(orderNo); profitLog.setOrderUserName(orderUser.getNickname()); + profitLog.setOrderRealName(orderUser.getRealName()); profitLog.setComments("投资设备：" + equipment.getEquipmentCode()); profitLog.setEquipmentCode(equipment.getEquipmentCode()); profitLog.setOrderSource(order.getOrderSource()); @@ -383,8 +388,12 @@ public class OrderTask { profitLog.setOrderId(order.getId()); profitLog.setOrderNo(orderNo); profitLog.setOrderUserName(orderUser.getNickname()); - profitLog.setComments("推广收益：" + orderUser.getPhone()); - profitLog.setEquipmentCode(equipment.getEquipmentCode()); + profitLog.setOrderRealName(orderUser.getRealName()); + profitLog.setComments(new StringBuilder("推广收益：") + .append("\n昵称："+tuijianUser.getNickname()) + .append("\n电话："+tuijianUser.getPhone()) + .toString()); + profitLog.setEquipmentCode(equipmentCode); profitLog.setOrderSource(order.getOrderSource()); // profitLog.setIsRenew(order.getIsRenew()); profitLogService.save(profitLog); @@ -406,8 +415,13 @@ public class OrderTask { profitLog.setOrderId(order.getId()); profitLog.setOrderNo(orderNo); profitLog.setOrderUserName(orderUser.getNickname()); + profitLog.setOrderRealName(orderUser.getRealName()); profitLog.setComments("门店收益：" + merchant.getMerchantName()); - profitLog.setEquipmentCode(equipment.getEquipmentCode()); + profitLog.setComments(new StringBuilder("门店收益：" + merchant.getMerchantName()) + .append("\n昵称："+merchant.getNickname()) + .append("\n电话："+merchant.getPhone()) + .toString()); + profitLog.setEquipmentCode(equipmentCode); profitLog.setMerchantName(merchant.getMerchantName()); profitLog.setOrderSource(order.getOrderSource()); // profitLog.setIsRenew(order.getIsRenew()); @@ -439,8 +453,12 @@ public class OrderTask { profitLog.setOrderId(order.getId()); profitLog.setOrderNo(orderNo); profitLog.setOrderUserName(orderUser.getNickname()); - profitLog.setComments("区域经理收益：" + order.getMerchantName()); - profitLog.setEquipmentCode(equipment.getEquipmentCode()); + profitLog.setOrderRealName(orderUser.getRealName()); + profitLog.setComments(new StringBuilder("区域经理收益：" + merchant.getMerchantName()) + .append("\n昵称："+manager.getNickname()) + .append("\n电话："+manager.getPhone()) + .toString()); + profitLog.setEquipmentCode(equipmentCode); profitLog.setMerchantName(merchant.getMerchantName()); profitLog.setOrderSource(order.getOrderSource()); // profitLog.setIsRenew(order.getIsRenew()); diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index 2bf65fe..795f507 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -111,10 +111,10 @@ public class User implements UserDetails { private Integer points; @ApiModelProperty("用户总支付的金额") - private String payMoney; + private BigDecimal payMoney; @ApiModelProperty("实际消费的金额(不含退款)") - private String expendMoney; + private BigDecimal expendMoney; @ApiModelProperty("会员等级ID") private Integer gradeId; @@ -131,6 +131,9 @@ public class User implements UserDetails { @ApiModelProperty("企业ID") private Integer companyId; + @ApiModelProperty("营业执照") + private String businessLicense; + @ApiModelProperty("注册来源客户端") private String platform; diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java index 003d9f6..9ca29eb 100644 --- a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java +++ b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java @@ -82,9 +82,9 @@ public class OpenAlipayController extends BaseController { String key = "setting:register:" + getTenantId(); String setting = redisUtil.get(key); - if (setting == null) { - throw new BusinessException("请先配置注册设置"); - } +// if (setting == null) { +// throw new BusinessException("请先配置注册设置"); +// } JSONObject jsonObject = JSONObject.parseObject(setting); String roleId = jsonObject.getString("roleId"); // 实例化客户端 @@ -141,7 +141,7 @@ public class OpenAlipayController extends BaseController { UserRole userRole = new UserRole(); userRole.setUserId(user.getUserId()); userRole.setTenantId(param.getTenantId()); - userRole.setRoleId(Integer.valueOf(roleId)); + userRole.setRoleId(Integer.valueOf(81)); userRoleService.save(userRole); // 添加第三方用户信息 UserOauth userOauth2 = new UserOauth(); diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java index 8c7b4c1..e93c644 100644 --- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java +++ b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java @@ -24,6 +24,7 @@ import com.gxwebsoft.common.core.utils.CacheClient; import com.gxwebsoft.common.core.utils.ImageUtil; import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserService; import com.gxwebsoft.oa.service.IdcardService; import com.gxwebsoft.oa.vo.IdcardRespVO; import com.gxwebsoft.shop.entity.Order; @@ -87,6 +88,9 @@ public class OpenEquipmentController extends BaseController { @Resource private CacheClient cacheClient; + @Resource + private UserService userService; + @PreAuthorize("hasAuthority('apps:equipment:list')") @ApiOperation("分页查询设备管理") @GetMapping("/page") @@ -329,7 +333,7 @@ public class OpenEquipmentController extends BaseController { saveData.setEquipmentId(one.getEquipmentId()); saveData.setUserId(orderUserId); saveData.setOrderId(orderId); - saveData.setMerchantCode(oldMerchantCode); + saveData.setMerchantCode(newMerchantCode); boolean b = equipmentService.updateById(saveData); // 记录新电池明细 EquipmentRecord record = new EquipmentRecord(); @@ -337,14 +341,14 @@ public class OpenEquipmentController extends BaseController { record.setEventType(EVENT_TYPE_BIND); record.setUserId(orderUserId); record.setOrderId(orderId); - record.setMerchantCode(oldMerchantCode); + record.setMerchantCode(newMerchantCode); equipmentRecordService.save(record); if (b) { // 解绑旧电池 old.setUserId(0); old.setOrderId(0); - old.setMerchantCode(newMerchantCode); + old.setMerchantCode(oldMerchantCode); equipmentService.updateById(old); // 记录明细 EquipmentRecord record2 = new EquipmentRecord(); @@ -352,7 +356,7 @@ public class OpenEquipmentController extends BaseController { record2.setUserId(orderUserId); record2.setOrderId(orderId); record2.setEventType(EVENT_TYPE_UNBIND); - record2.setMerchantCode(one.getMerchantCode()); + record2.setMerchantCode(oldMerchantCode); equipmentRecordService.save(record2); // 更新订单 order.setEquipmentId(one.getEquipmentId()); @@ -392,9 +396,9 @@ public class OpenEquipmentController extends BaseController { Order order = orderService.getById(receiptParam.getOrderId()); Integer receiptStatus = order.getReceiptStatus(); - if(receiptStatus == 20){ - return fail("订单已确认收货，不能重复确认！"); - } +// if(receiptStatus == 20){ +// return fail("订单已确认收货，不能重复确认！"); +// } // 验证身份证真实性 if(StringUtils.hasText(receiptParam.getOrderSourceData())) { String orderSourceDataString = receiptParam.getOrderSourceData(); @@ -414,6 +418,12 @@ public class OpenEquipmentController extends BaseController { order.setIdCode(verify.getIdCardNo()); order.setAddress(verify.getAddress()); + //更新用户信息 + User user = userService.getById(order.getUserId()); + user.setRealName(verify.getName()); + user.setIdCard(verify.getIdCardNo()); + user.setAddress(verify.getAddress()); + userService.updateUser(user); } // 短信验证码校验 @@ -493,9 +503,9 @@ public class OpenEquipmentController extends BaseController { refund.setOrderId(order.getOrderId()); refund.setOrderNo(order.getOrderNo()); refund.setOrderGoodsId(order.getGoodsId()); - refund.setUserId(getLoginUserId()); + refund.setUserId(order.getUserId()==null?getLoginUserId():order.getUserId()); refund.setType(10); - refund.setApplyDesc("申请退租"); + refund.setApplyDesc(isRefund == 3?"强制退租":"申请退租"); refund.setRefundMoney(new BigDecimal(0)); refund.setMerchantCode(order.getMerchantCode()); } diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java index 9b6d000..9dbbe09 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java @@ -83,6 +83,8 @@ public class OrderController extends BaseController { private FreezeOrderService freezeOrderService; @Resource private EquipmentOrderGoodsService equipmentOrderGoodsService; + @Resource + private OrderPayService orderPayService; @PreAuthorize("hasAuthority('shop:order:list')") @@ -116,7 +118,9 @@ public class OrderController extends BaseController { // 云芯威项目查询关联设备 // 查询订单的关联商品 - List list = orderService.listRel(param); + //List list = orderService.listRel(param);//注意：这里每次查询都全量会非常影响性能 + PageResult pageResult= orderService.pageRel(param); + List list = pageResult.getList(); if (CollectionUtils.isEmpty(list)) { return success(new PageResult<>(list, 0L)); @@ -129,20 +133,30 @@ public class OrderController extends BaseController { } List equipmentList = equipmentService.list(Wrappers.lambdaQuery(Equipment.class).in(Equipment::getEquipmentId, equipmentIds)); List equipmentOrderGoodsList = equipmentOrderGoodsService.list(Wrappers.lambdaQuery(EquipmentOrderGoods.class).in(EquipmentOrderGoods::getOrderId, orderIds)); + List orderPayList = orderPayService.list(Wrappers.lambdaQuery(OrderPay.class).eq(OrderPay::getPayStatus,20).in(OrderPay::getRentOrderId, orderIds)); // Map> equipmentCollect = equipmentList.stream().collect(Collectors.groupingBy(Equipment::getEquipmentId)); Map equipmentCollect = equipmentList.stream().collect(Collectors.toMap(Equipment::getEquipmentId, e->e)); Map> equipmentOrderGoodsCollect = equipmentOrderGoodsList.stream().collect(Collectors.groupingBy(EquipmentOrderGoods::getOrderId)); + Map> orderPayCollect = orderPayList.stream().collect(Collectors.groupingBy(OrderPay::getRentOrderId)); // 查询订单的设备 for (Order order : list) { + //计算缴费总钱数 + List orderPays = orderPayCollect.get(order.getOrderId()); + if (null != orderPays && !orderPays.isEmpty()) { + BigDecimal sum = orderPays.stream().map(OrderPay::getOrderPrice).reduce(BigDecimal.ZERO, BigDecimal::add); + order.setTotalPayPrice(sum); + } else { + order.setTotalPayPrice(BigDecimal.ZERO); + } + final OrderGoodsParam orderGoodsParam = new OrderGoodsParam(); orderGoodsParam.setOrderId(order.getOrderId()); List equipmentOrderGoods = equipmentOrderGoodsCollect.get(order.getOrderId()); - if (CollectionUtils.isEmpty(equipmentOrderGoods)) { - continue; + if (!CollectionUtils.isEmpty(equipmentOrderGoods)) { + EquipmentOrderGoods orderGoods = equipmentOrderGoods.get(0); + order.setEquipmentGoods(orderGoods); } - EquipmentOrderGoods orderGoods = equipmentOrderGoods.get(0); - order.setEquipmentGoods(orderGoods); // List equipment = equipmentCollect.get(order.getEquipmentId()); // if (CollectionUtils.isNotEmpty(equipment)) { // order.setEquipment(equipment.get(0)); @@ -152,12 +166,10 @@ public class OrderController extends BaseController { order.setEquipment(equipment); } } - PageParam page = new PageParam<>(param); - PageResult ret = new PageResult<>(list, page.getTotal()); - ret.setCount((long) list.size()); - return success(ret); - - + //PageParam page = new PageParam<>(param); + //PageResult ret = new PageResult<>(list, page.getTotal()); + //ret.setCount(pageResult.getCount()); + return success(pageResult); } @PreAuthorize("hasAuthority('shop:order:list')") diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java index 70608a4..d8573b0 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java @@ -115,6 +115,11 @@ public class OrderRefundController extends BaseController { OrderRefund refund = orderRefundService.getById(orderRefund.getOrderRefundId()); BeanCopier.create(orderRefund, refund, CopyOptions.create().ignoreNullValue()).copy(); + User loginUser = getLoginUser(); + if (loginUser != null) { + refund.setOperator(loginUser.getUsername());//操作人 + } + Integer auditStatus = orderRefund.getAuditStatus(); if(auditStatus.equals(20)){ BigDecimal refundMoney = orderRefund.getRefundMoney(); diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java index 5ffb718..799017f 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java @@ -410,6 +410,12 @@ public class PaymentController extends BaseController { order.setBatteryRent(parentOrder.getBatteryRent()); orderPayService.updateById(order); orderService.updateById(parentOrder); + + //更新消费金额 + User user = userService.getById(order.getUserId()); + user.setPayMoney(user.getPayMoney().add(new BigDecimal(payPrice))); + user.setExpendMoney(user.getExpendMoney().add(new BigDecimal(payPrice))); + userService.updateById(user); return "success"; } // TODO 验签失败则记录异常日志，并在response中返回failure. @@ -449,7 +455,9 @@ public class PaymentController extends BaseController { // 2. 扣除余额操作 BigDecimal subtract = balance.subtract(payPrice); user.setBalance(subtract); - userService.updateById(user); + user.setPayMoney(user.getPayMoney().add(payPrice)); + user.setExpendMoney(user.getExpendMoney().add(payPrice)); + userService.updateById(user);//FIXME 这里在未确定keep成功的情况下就扣了 // 3. 记录余额明细 UserBalanceLog userBalanceLog = new UserBalanceLog(); userBalanceLog.setUserId(userId); @@ -535,6 +543,8 @@ public class PaymentController extends BaseController { // 2. 扣除余额操作 BigDecimal subtract = balance.subtract(payPrice); user.setBalance(subtract); + user.setPayMoney(user.getPayMoney().add(payPrice)); + user.setExpendMoney(user.getExpendMoney().add(payPrice)); userService.updateById(user); // 3. 记录余额明细 UserBalanceLog userBalanceLog = new UserBalanceLog(); diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java index 496eed0..b2513ec 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/Order.java +++ b/src/main/java/com/gxwebsoft/shop/entity/Order.java @@ -328,10 +328,14 @@ public class Order implements Serializable { @TableField(exist = false) private Date insuranceExpireDate; - @ApiModelProperty(value = "是否申请退租，1为申请，2为取消") + @ApiModelProperty(value = "是否申请退租，1为申请，2为取消，3强制退租（后台操作）") @TableField(exist = false) private Integer isRefund; + @ApiModelProperty(value = "订单交费总数") + @TableField(exist = false) + private BigDecimal totalPayPrice; + public Integer getRestDay() { if(null != orderStatus){ switch(orderStatus){ diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java b/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java index d9334a8..6be7397 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java +++ b/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java @@ -88,6 +88,9 @@ public class OrderRefund implements Serializable { @TableLogic private Integer deleted; + @ApiModelProperty(value = "操作人") + private String operator; + @ApiModelProperty(value = "商户编码") private String merchantCode; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ProfitLog.java b/src/main/java/com/gxwebsoft/shop/entity/ProfitLog.java index c9c2475..d1575d6 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ProfitLog.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ProfitLog.java @@ -89,11 +89,15 @@ public class ProfitLog implements Serializable { private Integer equipmentId; @ApiModelProperty(value = "订单用户名") + //@TableField(exist = false) private String orderUserName; @ApiModelProperty(value = "订单用户手机号") private String orderUserPhone; + @ApiModelProperty(value = "订单用户实名") + private String orderRealName; + @ApiModelProperty(value = "租户id") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ProfitLogMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ProfitLogMapper.xml index ae018fe..42a25e0 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ProfitLogMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ProfitLogMapper.xml @@ -4,7 +4,7 @@ - SELECT a.* + SELECT a.*,b.user as orderUserName FROM shop_profit_log a diff --git a/src/main/java/com/gxwebsoft/shop/param/ProfitLogParam.java b/src/main/java/com/gxwebsoft/shop/param/ProfitLogParam.java index 6d67006..abaec48 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ProfitLogParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ProfitLogParam.java @@ -1,5 +1,6 @@ package com.gxwebsoft.shop.param; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.gxwebsoft.common.core.annotation.QueryField; import com.gxwebsoft.common.core.annotation.QueryType; @@ -51,6 +52,11 @@ public class ProfitLogParam extends BaseParam { @QueryField(type = QueryType.EQ) private String merchantName; + @ApiModelProperty(value = "收益人姓名") + @QueryField(value = "comments",type = QueryType.LIKE)//收益人目前存储在备注里面 + @TableField(exist = false) + private String beneficiaryName; + @ApiModelProperty(value = "收益类型（1资产收益，2服务费收益，3推广收益，4门店业绩提成，5站点业绩提成）") @QueryField(type = QueryType.EQ) private Integer scene; diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java index b7800de..17cf7b2 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java @@ -67,10 +67,20 @@ public class OrderServiceImpl extends ServiceImpl implements @Override public PageResult pageRel(OrderParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("delivery_time desc,create_time desc"); + String sort = param.getSort(); + String order = param.getOrder(); + if(StrUtil.isNotBlank(sort)){ + String orderStr = sort; + if(StrUtil.isNotBlank(order)){ + orderStr += " " + order; + } + page.setDefaultOrder(orderStr); + } else { + page.setDefaultOrder("create_time desc"); + } List list = baseMapper.selectPageRel(page, param); // 是否查询订单商品 - if(param.getShowGoodsList() != null){ + /*if(param.getShowGoodsList() != null){ list.forEach(d -> { final List goodsList = orderGoodsService.list(new LambdaQueryWrapper().eq(OrderGoods::getOrderId, d.getOrderId()).gt(OrderGoods::getTotalNum, 0)); goodsList.forEach(g -> { @@ -89,7 +99,7 @@ public class OrderServiceImpl extends ServiceImpl implements }); d.setGoodsList(goodsList); }); - } + }*/ return new PageResult<>(list, page.getTotal()); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 719f341..4b46b37 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,6 +9,12 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource +# 日志配置 +logging: + level: + com.gxwebsoft: DEBUG + com.baomidou.mybatisplus: DEBUG + socketio: host: localhost #IP地址 @@ -25,16 +31,3 @@ config: bucketName: oss-yunxinwei bucketDomain: https://oss.wsdns.cn aliyunDomain: https://oss-yunxinwei.oss-cn-shenzhen.aliyuncs.com - -# 日志配置 -logging: - level: - root: INFO - com.gxwebsoft: INFO - com.baomidou.mybatisplus: INFO - file: - name: yxw.log - logback: - rollingpolicy: -# file-name-pattern: - max-history: 30 diff --git a/src/main/resources/application-jimei.yml b/src/main/resources/application-jimei.yml deleted file mode 100644 index 7a6ad71..0000000 --- a/src/main/resources/application-jimei.yml +++ /dev/null @@ -1,36 +0,0 @@ -# 生产环境配置 - -# 数据源配置 -spring: - datasource: - url: jdbc:mysql://127.0.0.1:3318/jm_love?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 - username: jm_love - password: wHekGWckTYbLtfWh - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.alibaba.druid.pool.DruidDataSource - -# 日志配置 -logging: - file: - name: websoft-api.log - level: - root: WARN - com.gxwebsoft: ERROR - com.baomidou.mybatisplus: ERROR - -socketio: - host: 0.0.0.0 #IP地址 - -# 框架配置 -config: - # 生产环境接口 - server-url: https://server.jimeigroup.cn/api - file-server: https://file.jimeigroup.cn - upload-path: /wsdata/wwwroot/file.ws/ - - # 阿里云OSS云存储 - endpoint: https://oss-cn-shenzhen.aliyuncs.com - accessKeyId: LTAI5tFcrUsMQQGyjAtGFj7Z - accessKeySecret: rlm9mMxFLmsnVZAvlFi7mjqGfgrawH - bucketName: file-jimei - bucketDomain: https://oss.jimeigroup.cn diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index c7493db..5ffa03d 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -3,35 +3,28 @@ # 数据源配置 spring: datasource: - url: jdbc:mysql://47.119.165.234:3308/open_ws?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 - username: open_ws - password: DzAmFiZfPJ6ZGApm + url: jdbc:mysql://1.14.159.185:3318/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + username: yunxinwei + password: A56sK6aW2FA3wBy2 driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource # 日志配置 logging: file: - name: logs/websoft-api.log + name: websoft-api.log level: - root: INFO - com.gxwebsoft: INFO + root: WARN + com.gxwebsoft: ERROR com.baomidou.mybatisplus: ERROR - com.alipay.api: INFO - logback: - rollingpolicy: -# file-name-pattern: ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log - max-history: 30 socketio: host: 0.0.0.0 #IP地址 -# host: localhost # 框架配置 config: # 生产环境接口 server-url: https://yxw.wsdns.cn/api -# server-url: https://127.0.0.1:9090/api upload-path: /www/wwwroot/file.ws/ # 阿里云OSS云存储 @@ -41,9 +34,3 @@ config: bucketName: oss-yunxinwei bucketDomain: https://oss.wsdns.cn aliyunDomain: https://oss-yunxinwei.oss-cn-shenzhen.aliyuncs.com - -#定时表达式 -cron: - alert: 0 30 9 * * ? - profit: 0 0/2 * * * ? - timeoutOrder: 1 0 0 * * ? diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml deleted file mode 100644 index 679a412..0000000 --- a/src/main/resources/application-test.yml +++ /dev/null @@ -1,38 +0,0 @@ -# 测试环境配置 -server: - port: 9091 -socketio: - port: 9191 - host: localhost #IP地址 -# 数据源配置 -spring: - datasource: - url: jdbc:mysql://123.207.68.142:3318/jm-love-test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 - username: jm-love-test - password: jPNSsJZzeNfTSxhB - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.alibaba.druid.pool.DruidDataSource - -# 日志配置 -logging: - file: - name: websoft-api.log - level: - root: WARN - com.gxwebsoft: ERROR - com.baomidou.mybatisplus: ERROR - -# 框架配置 -config: - # 生产环境接口 - server-url: https://server.jimeigroup.cn/api - file-server: https://file.jimeigroup.cn - upload-path: /wsdata/wwwroot/file.ws/ - - # 阿里云OSS云存储 - endpoint: https://oss-cn-shenzhen.aliyuncs.com - accessKeyId: LTAI5tFcrUsMQQGyjAtGFj7Z - accessKeySecret: rlm9mMxFLmsnVZAvlFi7mjqGfgrawH - bucketName: file-jimei - bucketDomain: https://oss.jimeigroup.cn - diff --git a/websoft-api.log b/websoft-api.log deleted file mode 100644 index 91d10ad..0000000 --- a/websoft-api.log +++ /dev/null @@ -1,6 +0,0 @@ -2023-09-04 18:04:45.128 WARN 16904 --- [restartedMain] com.alibaba.druid.pool.DruidDataSource : removeAbandoned is true, not use in production. -2023-09-04 18:05:46.939 WARN 16904 --- [http-nio-9090-exec-1] c.a.druid.pool.DruidAbstractDataSource : discard long time none received connection. , jdbcUrl : jdbc:mysql://47.119.165.234:3308/open_ws?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 60613 -2023-09-04 18:05:46.960 WARN 16904 --- [http-nio-9090-exec-1] c.a.druid.pool.DruidAbstractDataSource : discard long time none received connection. , jdbcUrl : jdbc:mysql://47.119.165.234:3308/open_ws?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 60897 -2023-09-04 18:05:46.977 WARN 16904 --- [http-nio-9090-exec-1] c.a.druid.pool.DruidAbstractDataSource : discard long time none received connection. , jdbcUrl : jdbc:mysql://47.119.165.234:3308/open_ws?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 61166 -2023-09-04 18:05:46.993 WARN 16904 --- [http-nio-9090-exec-1] c.a.druid.pool.DruidAbstractDataSource : discard long time none received connection. , jdbcUrl : jdbc:mysql://47.119.165.234:3308/open_ws?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 61393 -2023-09-04 18:05:47.022 WARN 16904 --- [http-nio-9090-exec-1] c.a.druid.pool.DruidAbstractDataSource : discard long time none received connection. , jdbcUrl : jdbc:mysql://47.119.165.234:3308/open_ws?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8, version : 1.2.5, lastPacketReceivedIdleMillis : 61639 diff --git a/websoft-api.log.2023-08-30.0.gz b/websoft-api.log.2023-08-30.0.gz deleted file mode 100644 index 1fa6630..0000000 Binary files a/websoft-api.log.2023-08-30.0.gz and /dev/null differ diff --git a/websoft-api.log.2023-09-02.0.gz b/websoft-api.log.2023-09-02.0.gz deleted file mode 100644 index 6889e03..0000000 Binary files a/websoft-api.log.2023-09-02.0.gz and /dev/null differ diff --git a/websoft-api.log.2023-09-03.0.gz b/websoft-api.log.2023-09-03.0.gz deleted file mode 100644 index c52f602..0000000 Binary files a/websoft-api.log.2023-09-03.0.gz and /dev/null differ