bug修复

admin/src/views/order/orderDetail.vue

@@ -9,13 +9,14 @@
       <div class="title">用户信息</div>
       <div class="acea-row">
         <div class="description-term">用户昵称：{{orderDatalist.user?orderDatalist.user.nickname:orderDatalist.realName}}</div>
-        <div class="description-term">收货人：{{orderDatalist.realName}}</div>
+        <div class="description-term">绑定电话：{{orderDatalist.user.phone}}</div>
-        <div class="description-term">联系电话：{{orderDatalist.userPhone}}</div>
-        <div class="description-term" v-if="orderDatalist.statusStr.key !== 'toBeWrittenOff'">收货地址：{{orderDatalist.userAddress}}</div>
       </div>
       <el-divider></el-divider>
-      <div class="title">收货信息</div>
+      <div class="title">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货信息': '收货信息'}}</div>
       <div class="acea-row">
+        <div class="description-term">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货人': '收货人'}}：{{orderDatalist.realName}}</div>
+        <div class="description-term">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货电话': '收货电话'}}：{{orderDatalist.userPhone}}</div>
+        <div class="description-term" v-if="orderDatalist.statusStr.key !== 'toBeWrittenOff'">{{orderDatalist.statusStr.key === 'toBeWrittenOff'?'提货地址': '收货地址'}}：{{orderDatalist.userAddress}}</div>
         <div class="description-term">订单编号：{{orderDatalist.orderId}}</div>
         <div class="description-term">订单状态：{{orderDatalist.status | orderStatusFilter}}</div>
         <div class="description-term">商品总数：{{orderDatalist.totalNum}}</div>
@@ -32,7 +33,13 @@
         <div class="description-term" v-if="orderDatalist.shippingType === 2 && orderDatalist.statusStr.key === 'notShipped'">门店名称：{{orderDatalist.storeName}}</div>
         <div class="description-term" v-if="orderDatalist.shippingType === 2 && orderDatalist.statusStr.key === 'notShipped'">核销码：{{orderDatalist.user_phone}}</div>
         <div class="description-term">商家备注：{{orderDatalist.remark}}</div>
-        <div class="description-term" v-if="orderDatalist.statusStr.key === 'toBeWrittenOff'">提货码：{{orderDatalist.verifyCode}}</div>
+        <template v-if="orderDatalist.statusStr.key === 'toBeWrittenOff' && orderDatalist.systemStore">
+          <div class="description-term">提货码：{{orderDatalist.verifyCode}}</div>
+          <div class="description-term">门店名称：{{orderDatalist.systemStore.name}}</div>
+          <div class="description-term">门店电话：{{orderDatalist.systemStore.phone}}</div>
+          <div class="description-term">门店地址：{{orderDatalist.systemStore.address + orderDatalist.systemStore.detailedAddress}}</div>
+        </template>
+
       </div>
       <template v-if="orderDatalist.deliveryType === 'express'">
         <el-divider></el-divider>

app/.gitignore

@@ -1,24 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-build.sh
-.idea
-unpackage

app/libs/wechat.js

@@ -159,7 +159,7 @@ class AuthWechat {
 	auth(code) {
 		return new Promise((resolve, reject) => {
 			let loginType = Cache.get(LOGINTYPE);
-			alert(Cache.get("spread"))
+			console.log('spread', Cache.get("spread"))
 			wechatAuth(code, Cache.get("spread"), loginType)
 				.then(({
 					data

app/pages/users/order_list/index.vue

@@ -5,7 +5,7 @@
 				<view class='picTxt acea-row row-between-wrapper'>
 					<view class='text'>
 						<view class='name'>订单信息</view>
-						<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{orderData.sumPrice || 0}}</view>
+						<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{Number(orderData.sumPrice).toFixed(2) || 0}}</view>
 					</view>
 					<view class='pictrue'>
 						<image src='../../../static/images/orderTime.png'></image>

app/utils/index.js

@@ -26,7 +26,7 @@ export function silenceBindingSpread()
 	}
 	if(puid){
 		//#ifdef H5
-		 Cache.set('spread', 0);
+		 Cache.clear('spread');
 		//#endif
 		
 		//#ifdef MP

crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java

@@ -620,8 +620,8 @@ public class OrderServiceImpl implements OrderService {
         result.setEvaluatedCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_VERF, currentUser.getUid()).size());
         // 已完成
         result.setCompleteCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_COMPLETE, currentUser.getUid()).size());
-        // 退款中
+        // 退款中和已退款
-        result.setRefundCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_REFUNDING, currentUser.getUid()).size());
+        result.setRefundCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_REFUND, currentUser.getUid()).size());
         return result;
     }
 

crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java

@@ -398,7 +398,7 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductDao, StoreP
         // 对attr表做全量更新，删除原有数据保存现有数据
         attrService.removeByProductId(storeProduct.getId());
         storeProductAttrValueService.removeByProductId(storeProduct.getId());
-        if(storeProductRequest.getSpecType()) { // todo 确认单属性商品的attr参数
+        if(storeProductRequest.getSpecType()) {
             storeProductRequest.getAttr().forEach(e->{
                 e.setProductId(storeProductRequest.getId());
                 e.setAttrValues(StringUtils.strip(e.getAttrValues().replace("\"",""),"[]"));
@@ -421,9 +421,8 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductDao, StoreP
                         }
                         spav.setSuk(String.join(",",skuList));
                     }
-//                    HashMap<String, Object> attrValues = setAttrValueByRequest(storeProductRequest);
+                    spav.setAttrValue(JSON.toJSONString(attrValuesRequest.getAttrValue()));
-                spav.setAttrValue(JSON.toJSONString(attrValuesRequest.getAttrValue()));
+                    spav.setImage(systemAttachmentService.clearPrefix(spav.getImage()));
-//                    spav.setAttrValue(JSON.toJSONString(attrValues));
                     storeProductAttrValues.add(spav);
                 }
                 boolean saveOrUpdateResult = storeProductAttrValueService.saveOrUpdateBatch(storeProductAttrValues);

crmeb/src/main/java/com/zbkj/crmeb/store/utilService/OrderUtils.java

@@ -920,9 +920,10 @@ public class OrderUtils {
                 queryWrapper.eq(StoreOrder::getPaid, true);
                 queryWrapper.eq(StoreOrder::getStatus, 2);
                 break;
-            case Constants.ORDER_STATUS_H5_REFUND: // 退款
+            case Constants.ORDER_STATUS_H5_REFUND: // 包含已退款和退款中
                 queryWrapper.eq(StoreOrder::getPaid, true);
-                queryWrapper.in(StoreOrder::getRefundStatus, "1,2"); //大于0
+                queryWrapper.in(StoreOrder::getStatus,-1,-2);
+                queryWrapper.in(StoreOrder::getRefundStatus, 1,2);
                 break;
         }
         queryWrapper.eq(StoreOrder::getIsDel, false);

crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java

@@ -73,7 +73,6 @@ public class SystemCityServiceImpl extends ServiceImpl<SystemCityDao, SystemCity
         lambdaQueryWrapper.in(SystemCity::getIsShow, true);
         return dao.selectList(lambdaQueryWrapper);
     }
-
     /**
      * 修改状态
      * @param id integer id

crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemConfigServiceImpl.java

@@ -150,7 +150,6 @@ public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigDao, System
         //修改之前的数据
         updateStatusByFormId(systemFormCheckRequest.getId());
 
-        //批量插入
         saveBatch(systemConfigList);
 
         //删除之前隐藏的数据