diff --git a/yudao-module-member/yudao-module-member-biz/pom.xml b/yudao-module-member/yudao-module-member-biz/pom.xml
index 5ea21262..8a299144 100644
--- a/yudao-module-member/yudao-module-member-biz/pom.xml
+++ b/yudao-module-member/yudao-module-member-biz/pom.xml
@@ -94,6 +94,19 @@
yudao-spring-boot-starter-websocket
+
+
+ com.google.zxing
+ core
+ 3.4.1
+
+
+ com.google.zxing
+ javase
+ 3.4.1
+
+
+
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java
index 3e8e80a1..344b8a9d 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/BusinessRespVO.java
@@ -75,4 +75,10 @@ public class BusinessRespVO {
private BigDecimal reduce;
private String time;
+
+ private BigDecimal turnoverCompare;
+
+ private int orderSumCompare;
+
+ private BigDecimal priceAvgCompare;
}
\ No newline at end of file
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java
index 14369354..a705bc60 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java
@@ -173,6 +173,27 @@ public class AppStoreController {
return JsonUtils.toJsonString(StoreResult.success(null));
}
+
+
+ @PostMapping("/mgcr/order/payByCodeOrder")
+ @Operation(summary = "添加二维码订单")
+ public String payByCodeOrder(@RequestBody StoreOrderDto dto) {
+
+ String s = orderService.cardPay(dto);
+
+ if("true".equals(s)){
+ return JsonUtils.toJsonString(StoreResult.success(null));
+ } else if ("false".equals(s)) {
+ return JsonUtils.toJsonString(StoreResult.fail("余额不足"));
+ }else {
+ return JsonUtils.toJsonString(StoreResult.fail(s));
+ }
+ }
+
+
+
+
+
public String reverseHexAndConvert(String hexStr) {
// 将十六进制字符串反转,每两位一组
StringBuilder reversedHex = new StringBuilder();
@@ -191,4 +212,9 @@ public class AppStoreController {
return decimalStr;
}
+
+
+
+
+
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/dto/StoreOrderDto.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/dto/StoreOrderDto.java
index d7593c64..f8b65877 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/dto/StoreOrderDto.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/dto/StoreOrderDto.java
@@ -6,4 +6,6 @@ import lombok.Data;
public class StoreOrderDto extends StoreSaleGoodsDto{
private String cardNumber;
+
+ private String jwt;
}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
index 858fbd97..bfe43ef1 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
@@ -151,5 +151,11 @@ public class AppMemberUserController {
public CommonResult