Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-hd/controllers/GoodsController.php

@@ -188,8 +188,15 @@ class GoodsController extends BaseController
 
 
         //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
-        $data = GoodsCategoryService::assembleData($classIds,$goodsCateData,$goodsData, $oftenIds);
+        $data = GoodsCategoryService::assembleData($classIds, $goodsCateData, $goodsData, $oftenIds);
 
         util::success($data);
     }
+
+    //保存花材组合 shish 2021.4.10
+    public function actionSaveItemGroup()
+    {
+        util::complete();
+    }
+
 }

app-hd/controllers/PurchaseClearController.php

@@ -35,14 +35,14 @@ class PurchaseClearController extends BaseController
         }
         $id = $order['id'];
 
-        $name = $order['orderName'] ?? '购买商品';
+        $name = '1123';
         $totalFee = $order['actPrice'];
 
         //强制使用小程序的miniOpenId
         $openId = $this->admin['miniOpenId'];
 
         $typeList = dict::getConfig('capitalType');
-        $capitalType = $typeList['xhGhsOrder']['id'];
+        $capitalType = $typeList['xhPurchase']['id'];
         //流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
         $wxPayType = 0;
         if (httpUtil::isMiniProgram()) {
@@ -68,6 +68,7 @@ class PurchaseClearController extends BaseController
 
         //花卉宝代为申请的微信支付
         $merchantExtend = WxOpenClass::getWxInfo();
+
         if (isset($merchantExtend['wxPayApply']) && $merchantExtend['wxPayApply'] == 1) {
             $input->SetSub_openid($openId);
         } else {