From b83a7d0a9249e74ee337cc5ef2a97d1a100e08fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 20:11:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSVerifyUtil.java | 6 +--
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 4 +-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java | 7 +++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ShopStaffInfoDto.java | 15 +++++++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteFileService.java | 9 ++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 5 +-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 22 ++++++++--
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 9 +---
10 files changed, 59 insertions(+), 22 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ShopStaffInfoDto.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ShopStaffInfoDto.java
new file mode 100644
index 0000000..25a78b0
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ShopStaffInfoDto.java
@@ -0,0 +1,15 @@
+package com.ruoyi.system.api.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2025/7/25 20:10
+ */
+@Data
+public class ShopStaffInfoDto {
+ /**
+ * 门店id
+ */
+ private Long shopId;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
index 06014e6..a1d674c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
@@ -322,7 +322,7 @@
private String dyPoiId;
/**
- * 抖音门店id
+ * 快手门店id
*/
@TableField("ks_poi_id")
private String ksPoiId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
index 5a08282..c2b10f8 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
@@ -36,6 +36,13 @@
public R<String> getAppOrderTotal(CodeGetDto codeGetDto) {
return R.fail("获取二维码失败:" + throwable.getMessage());
}
+
+ @Override
+ public R<String> uploadOSS(MultipartFile file) {
+ return R.fail("上传OSS失败：" + throwable.getMessage());
+ }
};
+
+
}
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteFileService.java
index ad4773d..08200fa 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteFileService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteFileService.java
@@ -38,4 +38,13 @@
*/
@PostMapping("/file/getCodeUrl")
public R<String> getAppOrderTotal(@RequestBody CodeGetDto codeGetDto);
+
+
+ /**
+ * 上传oss
+ * @param file
+ * @return
+ */
+ @PostMapping(value = "/uploadOSS", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public R<String> uploadOSS(@RequestPart("file")MultipartFile file);
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 2ab3962..2cf0526 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -2324,9 +2324,8 @@
File file = wxMaService.getQrcodeService().createWxaCodeUnlimit(scene, path);
FileInputStream input = new FileInputStream(file);
MultipartFile multipartFile = new MyMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input));
-
- SysFile sysFile = remoteFileService.upload(multipartFile).getData();
- return sysFile.getUrl();
+ String data = remoteFileService.uploadOSS(multipartFile).getData();
+ return data;
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
index 2060ffb..fc5ace3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
@@ -33,7 +33,7 @@
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private Integer orderStatus;
- @ApiModelProperty(value="订单来源1.商城订单2.秒杀活动3.线下创建")
+ @ApiModelProperty(value="订单来源1.商城2.秒杀活动3.线下创建4.抽奖5.美团6.抖音7.快手")
private Integer orderFrom;
@ApiModelProperty(value="订单商品列表")
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 2bb8ae2..defa9b3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -1504,7 +1504,7 @@
appUserOrderGetVo.setCouponDiscount(order.getCouponMoney());
appUserOrderGetVo.setReceivableDeposit(order.getReceivableDeposit());
appUserOrderGetVo.setReceivableMoney(order.getReceivableMoney());
- appUserOrderGetVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getOnlinePayMoney()));
+ appUserOrderGetVo.setUnpaidMoney(order.getReceivableMoney().subtract(null == order.getOnlinePayMoney() ? BigDecimal.ZERO : order.getOnlinePayMoney()));
appUserOrderGetVo.setPayType(order.getPayType());
appUserOrderGetVo.setPayMoney(order.getPayMoney());
appUserOrderGetVo.setOrderRemark(order.getOrderRemark());
@@ -2239,11 +2239,15 @@
BigDecimal payAmount = BigDecimal.ZERO;
//优惠金额
BigDecimal payDiscountAmount = BigDecimal.ZERO;
+ Long createOrderTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+ Long payTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
if (null != tradeOrderQueryResponseData) {
TradeOrderQueryResponseDataOrdersItem ordersItem = tradeOrderQueryResponseData.getOrders().get(0);
originAmount = BigDecimal.valueOf(ordersItem.getOriginalAmount()).divide(new BigDecimal(100));
payAmount = BigDecimal.valueOf(ordersItem.getPayAmount()).divide(new BigDecimal(100));
payDiscountAmount = BigDecimal.valueOf(ordersItem.getDiscountAmount()).divide(new BigDecimal(100));
+ createOrderTime = ordersItem.getCreateOrderTime();
+ payTime = ordersItem.getPayTime();
}
Date nowTime = new Date();
@@ -2265,12 +2269,14 @@
order.setPayMoney(payAmount);
order.setOnlinePayMoney(payAmount);
order.setOrderRemark("抖音订单");
- order.setCreateTime(nowTime);
- order.setPayTime(nowTime);
+ order.setCreateTime(new Date(createOrderTime * 1000));
+ order.setPayTime(new Date(payTime * 1000));
order.setTripartiteOrderId(data.getOrderId());
order.setUseTime(nowTime);
order.setUseUserId(merVerifyOrderDto.getUserId());
order.setCloseFlag(1);
+ order.setGoodsNum(1);
+ order.setCouponMoney(BigDecimal.ZERO);
this.save(order);
//创建服务商品
//获取商品信息(商品简介,调理问题)
@@ -2501,11 +2507,15 @@
BigDecimal payAmount = BigDecimal.ZERO;
//优惠金额
BigDecimal payDiscountAmount = BigDecimal.ZERO;
+ Long create_order_time = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+ Long pay_time = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
if (null != orderDetailInfoV1) {
OpenApiOrderAmountV1 amountInfo = orderDetailInfoV1.getAmount();
originAmount = BigDecimal.valueOf(amountInfo.getTotal_amount());
payAmount = BigDecimal.valueOf(amountInfo.getPay_amount());
payDiscountAmount = originAmount.subtract(payAmount);
+ create_order_time = orderDetailInfoV1.getCreate_order_time();
+ pay_time = orderDetailInfoV1.getPay_time();
}
Date nowTime = new Date();
@@ -2527,12 +2537,14 @@
order.setPayMoney(payAmount);
order.setOnlinePayMoney(payAmount);
order.setOrderRemark("快手订单");
- order.setCreateTime(nowTime);
- order.setPayTime(nowTime);
+ order.setCreateTime(new Date(create_order_time * 1000));
+ order.setPayTime(new Date(pay_time * 1000));
order.setTripartiteOrderId(data.getOrder_id());
order.setUseTime(nowTime);
order.setUseUserId(merVerifyOrderDto.getUserId());
order.setCloseFlag(1);
+ order.setGoodsNum(1);
+ order.setCouponMoney(BigDecimal.ZERO);
this.save(order);
//创建服务商品
//获取商品信息(商品简介,调理问题)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSVerifyUtil.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSVerifyUtil.java
index 653ea9c..3a3e4b2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSVerifyUtil.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSVerifyUtil.java
@@ -29,8 +29,7 @@
*/
public static VerifyPrepareDataNew certificatePrepare(RedisService redisService, String code){
//判断token是否过期
-// Object ks_access_token = redisService.getCacheObject("ks_access_token");
- Object ks_access_token = "ChFvYXV0aC5hY2Nlc3NUb2tlbhIw2wStpH_xKVvdiMW3FC-K5jaDZuWrAE-s_Snu40VKs7D-Syd_cVWqZO_y9APvkvVUGhLOP4f6O_NIH5dNtHtm_4-XE8QiIFE-h8UpEf22Wbcrj4qUb_zFeGnZHgwa6rj1h6QVbrQFKAUwAQ";
+ Object ks_access_token = redisService.getCacheObject("ks_access_token");
if(null == ks_access_token){
//刷新token
KSClientTokenUtil.refreshToken(redisService);
@@ -72,8 +71,7 @@
*/
public static List<VerifyResult> certificateVerify(RedisService redisService, String verify_token, String poiId, List<String> encryptedCodes, String order_id){
//判断token是否过期
-// Object ks_access_token = redisService.getCacheObject("ks_access_token");
- Object ks_access_token = "ChFvYXV0aC5hY2Nlc3NUb2tlbhIw2wStpH_xKVvdiMW3FC-K5jaDZuWrAE-s_Snu40VKs7D-Syd_cVWqZO_y9APvkvVUGhLOP4f6O_NIH5dNtHtm_4-XE8QiIFE-h8UpEf22Wbcrj4qUb_zFeGnZHgwa6rj1h6QVbrQFKAUwAQ";
+ Object ks_access_token = redisService.getCacheObject("ks_access_token");
if(null == ks_access_token){
//刷新token
KSClientTokenUtil.refreshToken(redisService);
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 1323ef8..5fd20f0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -1635,11 +1635,11 @@
<select id="getMerOrderTotalOrderFrom" resultType="com.ruoyi.order.domain.vo.MerOrderTotalVo">
SELECT
COUNT(order_id) orderTotal,
- IFNULL(SUM(CASE WHEN order_from = 1 THEN 1 ELSE 0 END),0) onlineTotal,
+ IFNULL(SUM(CASE WHEN order_from in (1,4,5,6,7) THEN 1 ELSE 0 END),0) onlineTotal,
IFNULL(SUM(CASE WHEN order_from = 3 THEN 1 ELSE 0 END),0) offlineTotal,
IFNULL(SUM(CASE WHEN order_from = 2 THEN 1 ELSE 0 END),0) activityTotal,
IFNULL(SUM(CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END),0) orderMoney,
- IFNULL(SUM(CASE WHEN order_from = 1 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) onlineMoney,
+ IFNULL(SUM(CASE WHEN order_from in (1,4,5,6,7) THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) onlineMoney,
IFNULL(SUM(CASE WHEN order_from = 3 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) offlineMoney,
IFNULL(SUM(CASE WHEN order_from = 2 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) activityMoney
FROM t_order WHERE del_flag = 0 AND order_status = 3
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index 127c50a..b997c44 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -9,10 +9,7 @@
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.shop.*;
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MerEditUserDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.shop.ShopNonAppointableTime;
import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
@@ -126,9 +123,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "当前商户id", name = "shopId", required = true, dataType = "Long", paramType = "query")
})
- public R<MerStaffInfoVo> getShopStaffInfo(@RequestParam("shopId") Long shopId) {
+ public R<MerStaffInfoVo> getShopStaffInfo(@RequestBody ShopStaffInfoDto dto) {
Long userId = SecurityUtils.getUserId();
- Shop shop = shopService.getByShopId(shopId);
+ Shop shop = shopService.getByShopId(dto.getShopId());
MerStaffInfoVo merStaffInfoVo = shopStaffService.getShopStaffInfo(userId, shop);
return R.ok(merStaffInfoVo);
}
--
Gitblit v1.7.1