diff --git a/README.md b/README.md
index 4e82b3562..17ab028b0 100644
--- a/README.md
+++ b/README.md
@@ -163,8 +163,9 @@ So~~想要用CRMEB开源商城系统做公益项目的朋友，可以来免费
---
### 📞 CRMEB互动
-#### 技术娱乐！代码写累了？那就歇会吧！扫码让你开心一刻！
-
+#### CRMEB开源技术交流群
+#### 扫码进群可领取开源版接口文档、产品功能清单、高清UI设计图、思维脑图！
+
#### 技术社区！找方法、提bug、看官方消息、拿活跃大奖！都在 CRMEB 技术社区 应有尽有
#### 技术交流！CRMEB开源商城系统开发QQ频道已开启，点击加入一起交流学习
diff --git a/crmeb/app/adminapi/controller/v1/system/Clear.php b/crmeb/app/adminapi/controller/v1/system/Clear.php
index 0578a9394..ada8648fc 100644
--- a/crmeb/app/adminapi/controller/v1/system/Clear.php
+++ b/crmeb/app/adminapi/controller/v1/system/Clear.php
@@ -33,7 +33,7 @@ class Clear extends AuthController
*/
public function refresh_cache()
{
- $this->services->refresCache();
+ $this->services->refreshCache();
return app('json')->success(400302);
}
diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php
index 1a4fdd9c0..e3cc4de87 100644
--- a/crmeb/app/api/controller/v1/order/StoreOrderController.php
+++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php
@@ -283,7 +283,7 @@ class StoreOrderController
}
case PayServices::OFFLINE_PAY:
if ($this->services->setOrderTypePayOffline($order['order_id'])) {
- event('NoticeListener', [$order, 'admin_pay_success_code']);
+ event('NoticeListener', [$order->toArray(), 'admin_pay_success_code']);
return app('json')->status('success', 410203);
} else {
return app('json')->status('success', 410216);
diff --git a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
index d6ed3064d..8d6f66fef 100644
--- a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
+++ b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
@@ -279,11 +279,12 @@ class StoreCouponIssueServices extends BaseServices
$data['coupon_title'] = $item['title'];
$data['coupon_price'] = $item['coupon_price'];
$data['use_min_price'] = $item['use_min_price'];
+ $data['add_time'] = $time;
if ($item['coupon_time']) {
- $data['add_time'] = $time;
+ $data['start_time'] = $time;
$data['end_time'] = $data['add_time'] + $item['coupon_time'] * 86400;
} else {
- $data['add_time'] = $item['start_use_time'];
+ $data['start_time'] = $item['start_use_time'];
$data['end_time'] = $item['end_use_time'];
}
$data['type'] = 'send';
diff --git a/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php b/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php
index ad82f605c..858ed8dfe 100644
--- a/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php
+++ b/crmeb/app/services/activity/lottery/LuckLotteryRecordServices.php
@@ -24,6 +24,8 @@ use app\services\wechat\WechatUserServices;
use crmeb\exceptions\ApiException;
use crmeb\services\app\WechatService;
use think\facade\Log;
+use crmeb\services\pay\Pay;
+
/**
* 抽奖记录
@@ -185,7 +187,16 @@ class LuckLotteryRecordServices extends BaseServices
case 4:
/** @var WechatUserServices $wechatServices */
$wechatServices = app()->make(WechatUserServices::class);
- $openid = $wechatServices->getWechatOpenid($uid, 'wechat');
+ $openid = $wechatServices->uidToOpenid((int)$uid, 'wechat');
+ $type = 'JSAPI';
+ if (!$openid) {
+ $openid = $wechatServices->uidToOpenid((int)$uid, 'routine');
+ $type = 'mini';
+ }
+ if (!$openid) {
+ $openid = $wechatServices->uidToOpenid((int)$uid, 'app');
+ $type = 'APP';
+ }
if ($openid) {
/** @var StoreOrderCreateServices $services */
$services = app()->make(StoreOrderCreateServices::class);
@@ -200,7 +211,17 @@ class LuckLotteryRecordServices extends BaseServices
'nickname' => $userInfo['nickname'],
'phone' => $userInfo['phone']
], 'luck');
- WechatService::merchantPay($openid, $wechat_order_id, $prize['num'], '抽奖中奖红包');
+ if (sys_config('pay_wechat_type')) {
+ $pay = new Pay('v3_wechat_pay');
+ $pay->merchantPay($openid, $wechat_order_id, $prize['num'], [
+ 'type' => $type,
+ 'batch_name' => '抽奖中奖红包',
+ 'batch_remark' => '您于' . date('Y-m-d H:i:s') . '中奖.' . $prize['num'] . '元'
+ ]);
+ } else {
+ WechatService::merchantPay($openid, $wechat_order_id, $prize['num'], '抽奖中奖红包');
+ }
+
}
break;
case 5:
diff --git a/crmeb/app/services/message/notice/WechatTemplateListService.php b/crmeb/app/services/message/notice/WechatTemplateListService.php
index 50f0a2091..fbe62011c 100644
--- a/crmeb/app/services/message/notice/WechatTemplateListService.php
+++ b/crmeb/app/services/message/notice/WechatTemplateListService.php
@@ -216,7 +216,7 @@ class WechatTemplateListService extends NoticeService
$adminList = $StoreServiceServices->getStoreServiceOrderNotice();
foreach ($adminList as $item) {
$this->sendTemplate((int)$item['uid'], [
- 'short_string6' => $status,
+ 'short_thing6' => $status,
'character_string1' => $orderId,
'time2' => date('Y-m-d H:i:s', time()),
], $link);
diff --git a/crmeb/app/services/pay/RechargeServices.php b/crmeb/app/services/pay/RechargeServices.php
index 8398e2602..5b1885c40 100644
--- a/crmeb/app/services/pay/RechargeServices.php
+++ b/crmeb/app/services/pay/RechargeServices.php
@@ -62,7 +62,7 @@ class RechargeServices
throw new ApiException(410278);
}
- if ($recharge['recharge_type'] == PayServices::WEIXIN_PAY && !request()->isH5()) {
+ if ($recharge['recharge_type'] == PayServices::WEIXIN_PAY && !request()->isH5() && !request()->isApp()) {
/** @var WechatUserServices $wechatUser */
$wechatUser = app()->make(WechatUserServices::class);
diff --git a/crmeb/app/services/system/log/ClearServices.php b/crmeb/app/services/system/log/ClearServices.php
index 70bd61380..438723d04 100644
--- a/crmeb/app/services/system/log/ClearServices.php
+++ b/crmeb/app/services/system/log/ClearServices.php
@@ -51,7 +51,7 @@ class ClearServices extends BaseServices
/**
* 刷新数据缓存
*/
- public function refresCache()
+ public function refreshCache()
{
$root = app()->getRootPath() . 'runtime' . DS;
$adminRoute = $root . 'admin';
@@ -78,6 +78,6 @@ class ClearServices extends BaseServices
}
}
}
- CacheService::clear();
+ CacheService::clearAll();
}
}
diff --git a/crmeb/crmeb/services/CacheService.php b/crmeb/crmeb/services/CacheService.php
index 8e43e70cc..8511cf916 100644
--- a/crmeb/crmeb/services/CacheService.php
+++ b/crmeb/crmeb/services/CacheService.php
@@ -98,6 +98,19 @@ class CacheService
return Cache::tag($tag)->clear();
}
+ /**
+ * 清空全部缓存
+ * @return bool
+ * @author 吴汐
+ * @email 442384644@qq.com
+ * @date 2023/12/19
+ */
+ public static function clearAll()
+ {
+ return Cache::clear();
+ }
+
+
/**
* 检查缓存是否存在
* @param string $key
diff --git a/readme/pic/开源群.jpg b/readme/pic/开源群.jpg
new file mode 100644
index 000000000..04dfd2a8d
Binary files /dev/null and b/readme/pic/开源群.jpg differ