1

app/admin/controller/order/StoreOrder.php

@@ -627,7 +627,7 @@ class StoreOrder extends AuthController
                 if ($bill_integral['number'] > $user_integral)
                     $bill_integral['number'] = $user_integral;
                 User::bcDec($bill_integral['uid'], 'integral', $bill_integral['number'], 'uid');
-                UserBill::expend('退款扣除积分', $bill_integral['uid'], 'integral', 'gain', $bill_integral['number'], $id, bcsub($user_integral, $bill_integral['number'], 2), '订单退款扣除积分' . floatval($bill_integral['number']) . '积分');
+                UserBill::expend('退款扣除健康豆', $bill_integral['uid'], 'integral', 'gain', $bill_integral['number'], $id, bcsub($user_integral, $bill_integral['number'], 2), '订单退款扣除健康豆' . floatval($bill_integral['number']) . '健康豆');
             }
 
             BaseModel::commitTrans();

app/admin/model/order/StoreOrder.php

@@ -1084,7 +1084,7 @@ HTML;
             'remark' => '点击查看订单详情'
         ];
         @file_put_contents('quanju.txt',  json_encode($postageData)."-测试模版消息\r\n", 8);
-        if ($postageData['delivery_type'] == 'express') {//送货
+        if ($postageData['delivery_type'] == 'express') {//快递
             $goodsName = StoreOrderCartInfo::getProductNameList($order['id']);
             if ($order['is_channel'] == 1) {
                 //小程序送货模版消息
@@ -1098,8 +1098,9 @@ HTML;
 //                    'keyword4' => $postageData['delivery_name'],
 //                    'keyword5' => $postageData['delivery_id']
 //                ]);
+                var_dump($goodsName);die();
                 if ($goodsName === ''){
-                    $goodsName = '测试商品';
+                    $goodsName = '商品';
                 }
                 $group = array_merge($group, [
                     'thing4' => '测试商品',
@@ -1113,7 +1114,7 @@ HTML;
                 $res= WechatTemplateService::sendTemplate($openid, WechatTemplateService::ORDER_DELIVER_SUCCESS, $group, $url);
                 @file_put_contents('quanju.txt',  json_encode($res)."-模版消息返回\r\n", 8);
             }
-        } else if ($postageData['delivery_type'] == 'send') {//发货
+        } else if ($postageData['delivery_type'] == 'send') {//送货
             if ($order['is_channel'] == 1) {
                 //小程序发货模版消息
                 RoutineTemplate::sendOrderPostage($order, 1);

app/models/routine/RoutineTemplate.php

@@ -57,18 +57,18 @@ class RoutineTemplate extends BaseModel
         $storeTitle = StoreOrder::getSubstrUTf8($storeTitle, 20, 'UTF-8', '');
         if ($isGive) {//快递发货
             @file_put_contents('quanju.txt',  "-模版消息2\r\n", 8);
-            return self::sendOut('ORDER_DELIVER_SUCCESS', $order['uid'], [
+            return self::sendOut('ORDER_POSTAGE_SUCCESS', $order['uid'], [
                 'character_string2' => $order['delivery_id'],
                 'thing1' => $order['delivery_name'],
                 'time3' => date('Y-m-d H:i:s', time()),
                 'thing5' => $storeTitle,
             ], '/pages/order_details/index?order_id=' . $order['order_id']);
         } else {//同城配送
-            return self::sendOut('ORDER_POSTAGE_SUCCESS', $order['uid'], [
-                'thing8' => $storeTitle,
-                'character_string1' => $order['order_id'],
-                'name4' => $order['delivery_name'],
-                'phone_number10' => $order['delivery_id']
+            return self::sendOut('ORDER_DELIVER_SUCCESS', $order['uid'], [
+                'thing6' => $storeTitle,  //商品
+                'thing10' => $order['order_id'], //送货人员
+                'phone_number11' => $order['delivery_name'],  //送货电话
+                'thing3' => $order['delivery_id'] //配送地址
             ], '/pages/order_details/index?order_id=' . $order['order_id']);
         }
     }

app/models/store/StoreOrder.php

@@ -434,7 +434,7 @@ class StoreOrder extends BaseModel
                         $res2 = false !== User::bcDec($userInfo['uid'], 'integral', $payIntegral, 'uid');
                     }
                     $SurplusIntegral = bcsub($userInfo['integral'], $payIntegral, 2);
-                    $res2 = $res2 && false != UserBill::expend('积分商品', $uid, 'integral', 'integral_product', $payIntegral, $key, $SurplusIntegral, '购买积分商品使用' . $payIntegral . '积分');
+                    $res2 = $res2 && false != UserBill::expend('积分商品', $uid, 'integral', 'integral_product', $payIntegral, $key, $SurplusIntegral, '购买积分商品使用' . $payIntegral . '健康豆');
                 }
 
                 //积分抵扣

config/template.php

@@ -21,7 +21,7 @@ return [
                 //订单发货提醒(快递)
                 'ORDER_POSTAGE_SUCCESS' => '42984',
                 //订单发货提醒(送货)
-                'ORDER_DELIVER_SUCCESS' => '42984',
+                'ORDER_DELIVER_SUCCESS' => '53653',
                 //订单收货通知
                 'ORDER_TAKE_SUCCESS' => 'OPENTM413386489',
                 //退款进度通知
@@ -45,16 +45,16 @@ return [
         //订阅消息
         'subscribe' => [
             'template_id' => [
-                //订单发货提醒(送货)
-                'ORDER_POSTAGE_SUCCESS' => 42984,
+                //订单发货提醒(快递)
+                'ORDER_POSTAGE_SUCCESS' =>42984 ,
                 //提现成功通知
                 'USER_EXTRACT' => 1470,
                 //确认收货通知
                 'OREDER_TAKEVER' => 1481,
                 //订单取消
                 'ORDER_CLONE' => 1134,
-                //订单发货提醒(快递)
-                'ORDER_DELIVER_SUCCESS' => 42984,
+                //订单发货提醒(送货)
+                'ORDER_DELIVER_SUCCESS' => 53653,
                 //拼团成功
                 'PINK_TRUE' => 3098,
                 //砍价成功

crmeb/services/WechatTemplateService.php

@@ -26,10 +26,10 @@ class WechatTemplateService implements ProviderInterface
     const ORDER_PAY_SUCCESS = 'OPENTM207791277';
 
     //订单发货提醒(快递)
-    const ORDER_POSTAGE_SUCCESS = 'OPENTM200565259';
+    const ORDER_POSTAGE_SUCCESS = '42984';
 
     //订单发货提醒(送货)
-    const ORDER_DELIVER_SUCCESS = '42984';
+    const ORDER_DELIVER_SUCCESS = '53653';
 
     //订单收货通知
     const ORDER_TAKE_SUCCESS = 'OPENTM413386489';