更新开源已知问题

crmeb/app/adminapi/controller/v1/diy/Diy.php

@@ -277,9 +277,9 @@ class Diy extends AuthController
             if ($info['is_diy']) {
                 foreach ($info['value'] as &$item) {
                     if ($item['name'] === 'goodList') {
-                        if(isset($item['goodsList']['ids']) && count($item['goodsList']['ids'])){
+                        if (isset($item['goodsList']['ids']) && count($item['goodsList']['ids'])) {
                             $item['goodsList']['list'] = $services->getSearchList(['ids' => $item['goodsList']['ids']]);
-                        }else{
+                        } else {
                             $item['goodsList']['list'] = [];
                         }
                     } elseif ($item['name'] === 'articleList') {//文章
@@ -401,6 +401,7 @@ class Diy extends AuthController
         ]);
         $id = $where['id'];
         unset($where['id']);
+        $where['is_show'] = 1;
         /** @var StoreCategoryServices $storeCategoryServices */
         $storeCategoryServices = app()->make(StoreCategoryServices::class);
         if ($storeCategoryServices->value(['id' => $id], 'pid')) {

crmeb/app/listener/notice/Notice.php

@@ -209,7 +209,7 @@ class Notice implements ListenerInterface
                         }
                         //模板消息小程序订阅消息
                         if ($userType == 'routine') {
-                            $RoutineTemplateList->sendOrderRefundSuccess($order['uid'], $order, $storeTitle);
+                            $RoutineTemplateList->sendOrderRefundSuccess($order['uid'], $order, $storeTitle, $datas);
                         }
                         break;
                     //退款未通过

crmeb/app/services/message/notice/RoutineTemplateListService.php

@@ -143,14 +143,14 @@ class RoutineTemplateListService extends NoticeService
      * @param array $order
      * @return bool
      */
-    public function sendOrderRefundSuccess($openid, $order, $storeTitle)
+    public function sendOrderRefundSuccess($openid, $order, $storeTitle, $data)
     {
         return $this->sendTemplate('ORDER_REFUND', $openid, [
             'thing1' => '已成功退款',
             'thing2' => $storeTitle,
             'amount3' => $order['pay_price'],
-            'character_string6' => $order['order_id']
-        ], '/pages/users/order_details/index?order_id=' . $order['order_id'] . '&isReturen=1');
+            'character_string6' => $data['order_id']
+        ], '/pages/users/order_details/index?order_id=' . $data['order_id'] . '&isReturen=1');
     }
 
     /**

crmeb/app/services/order/StoreOrderCreateServices.php

@@ -190,7 +190,7 @@ class StoreOrderCreateServices extends BaseServices
             'cart_id' => $cartIds,
             'total_num' => $totalNum,
             'total_price' => $priceGroup['totalPrice'],
-            'total_postage' => $priceGroup['storePostage'],
+            'total_postage' => $shippingType == 1 ? $priceGroup['storePostage'] : 0,
             'coupon_id' => $couponId,
             'coupon_price' => $priceData['coupon_price'],
             'pay_price' => $priceData['pay_price'],

crmeb/app/services/wechat/WechatMessageServices.php

@@ -52,12 +52,19 @@ class WechatMessageServices extends BaseServices
         if ($res) Cache::set($cacheName, 1, $cacheTime);
         return $res;
     }
+
     /**
      * 微信消息前置操作
      * @param $event
      */
     public function wechatMessageBefore($message)
     {
+        //后台开启，用户直接关注公众号才会生成用户
+        if (intval(sys_config('create_wechat_user', 0))) {
+            /** @var WechatUserServices $wechatUser */
+            $wechatUser = app()->make(WechatUserServices::class);
+            $wechatUser->saveUser($message->FromUserName);
+        }
         $event = isset($message->Event) ?
             $message->MsgType . (
             $message->Event == 'subscribe' && isset($message->EventKey) ? '_scan' : ''
@@ -66,7 +73,7 @@ class WechatMessageServices extends BaseServices
         $openid = $message->FromUserName;
         $type = strtolower($event);
         $add_time = time();
-        if(!$this->dao->save(compact('result','openid','type','add_time'))){
+        if (!$this->dao->save(compact('result', 'openid', 'type', 'add_time'))) {
             throw new ValidateException('更新信息失败');
         }
         return true;

crmeb/public/static/js/pages-activity-lottery-grids-record~pages-admin-orderDetail-index~pages-goods_details-index~pages-po~a07e3a4f.fe1b6bff.js

@@ -1,4 +1,4 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-activity-lottery-grids-record~pages-admin-orderDetail-index~pages-goods_details-index~pages-po~a07e3a4f"],{"8c57":function(t,e,n){n("a4d3"),n("e01a"),n("d28b"),n("944a"),n("4160"),n("d81d"),n("fb6a"),n("0c47"),n("23dc"),n("3410"),n("131a"),n("d3b7"),n("25f0"),n("3ca3"),n("159b"),n("ddb0"),
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-activity-lottery-grids-record~pages-admin-orderDetail-index~pages-goods_details-index~pages-po~a07e3a4f"],{"5fba":function(t,e,n){n("a4d3"),n("e01a"),n("d28b"),n("944a"),n("4160"),n("d81d"),n("fb6a"),n("0c47"),n("23dc"),n("3410"),n("131a"),n("d3b7"),n("25f0"),n("3ca3"),n("159b"),n("ddb0"),
 /*!
  * clipboard.js v2.0.6
  * https://clipboardjs.com/