update 合伙人、花店端

xuxueyang

2024-09-13 731b3a23a6369aaef5c4fdc0ff4524eb6a7f3642

 sub_pages/customer/shopping/confirm.vue

@@ -2,6 +2,7 @@
   import {
      mapState
   } from 'vuex'
   import environments from '@/environments'

   export default {
      name: "订单详情",
@@ -10,11 +11,80 @@
            address: state => {
               return state.defaultaddress || {}
            },
            cache_coupon: state => {
               return state.cache.coupon || {}
            },
            cache_goods: state => {
               return state.cache.goods || []
            },
         }),
         coupon_fee() {
            //优惠券
            if (this.dto.couponRecordId && this.cache_coupon) {
               //计算优惠券
               if (this.cache_coupon.couponDiscountType === 'zero') {
                  return parseFloat(this.cache_coupon.couponDiscountValue).toFixed(2) || 0
               } else if (this.cache_coupon.minOrderAmount && this.cache_coupon.minOrderAmount > 0) {
                  var total = (this.dto.totalMemberAmount || this.dto.totalAmount || 0).toFixed(2)
                  // + (this.dto.packing || 0) +
                  //    (this.current_transport.fee ||
                  //       0) || 0)
                  // .toFixed(2)

                  if (total >= this.cache_coupon.minOrderAmount) {
                     return parseFloat(this.cache_coupon.couponDiscountValue).toFixed(2) || 0
                  } else {

                  }
               } else {
                  return parseFloat(this.cache_coupon.couponDiscountValue).toFixed(2) || 0
               }
            }

            return 0
         },
         order_fee() {
            // 如果订单-优惠券<0,就等于0 +打包+运费，如果还等于0，那么就0.01
            var m1 = parseFloat(this.dto.totalMemberAmount || this.dto.totalAmount || 0)
            var m2 = parseFloat((this.dto.packing || 0) + (this.current_transport.fee || 0))

            if (m1 <= parseFloat(this.coupon_fee)) {
               if (m2 > 0) {
                  return (m2).toFixed(2)
               } else {
                  return '0.01'
               }
            } else {
               return ((m1 - parseFloat(this.coupon_fee)) + m2).toFixed(2)
            }

         }

      },
      async beforeDestroy() {
         await this.$store.dispatch('cache_coupon_select', {})
         await this.$store.dispatch('cache_goods_select', [])

      },
      async onShow() {

         //优惠券
         if (this.cache_coupon && this.cache_coupon.id) {
            this.dto.couponRecordId = this.cache_coupon.id
            this.dto.couponRecordStr = this.cache_coupon.couponName
         } else if (this.cache_coupon && !this.cache_coupon.id) {
            this.dto.couponRecordId = ''
            this.dto.couponRecordStr = ''
         }
         //兑换券
         this.dto.goodsRecordIdListStr = ''
         if (this.cache_goods && this.cache_goods.length > 0) {
            this.dto.goodsRecordIdListStr = ''
            var names = []
            for (var tmp of this.cache_goods) {
               names.push(tmp.name || tmp.title || '')
            }
            this.dto.goodsRecordIdListStr = names.join(',')
         }
      },
      onLoad(options) {
         // console.log('dto',options)
@@ -37,11 +107,38 @@
               value: ''
            })
         })
         if (this.address.id) {
            this.loadTransportList()
            this.cacheAddressId = this.address.id
         }
         // 
         //先获取直接的全部地址
         // @ApiModelProperty(value = "订单商品")
         //   private List<FlowerCartListDTO> flowers;
         // @ApiModelProperty(value = "打包费")
         //   private BigDecimal packing;

         // 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过

         if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
            // 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。

            this.$http.request('get', '/api/current/customer/partner', {
               params: {
                  // id: this.currentInfo.customerDTO.partnerId
               }
            }).then(async res => {
               if (res.code == 0) {
                  this.partnerInfo = res.data || {}
                  if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
                     //刷新用户信息
                     await this.$store.dispatch('getCurrentInfo')
                  }
               }
            })


         }

      },
      data() {
@@ -53,6 +150,9 @@
               transportId: '',
               addressId: '',
               flowers: [],
               couponRecordId: '',
               couponRecordStr: '',
               goodsRecordIdListStr: '',
            },
            current_transport: {},
            cacheAddressId: '',
@@ -61,6 +161,7 @@
            need_columns: [
               []
            ],
            partnerInfo: {},

         }
      },
@@ -70,18 +171,47 @@
               this.loadTransportList()
               this.cacheAddressId = nv.id

            } else if (!nv.id) {
               //说明id清空了
               if (!this.cacheAddressId) {
                  transportList = []
                  this.cacheAddressId = ''
               }
            }
         }
      },
      methods: {
         toSelectCoupon() {
            //跳转去列表页面进行选择
            var total = ((this.dto.totalMemberAmount || this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this
                  .current_transport.fee ||
                  0) || 0)
               .toFixed(2)
            // if (total >= this.cache_coupon.minOrderAmount) {
            //    return this.cache_coupon.couponDiscountValue || 0
            // }

            uni.navigateTo({
               url: `/sub_pages/customer/coupon/coupon-self?source=shopping&paymoney=${total}`
            })
         },
         toSelectGood() {
            //跳转去列表页面进行选择
            uni.navigateTo({
               url: '/sub_pages/customer/coupon/good-self?source=shopping'
            })
         },
         select_need(e) {
            this.show_select_need = false
            this.dto.specialNeedsStr = e.value[0].label
            this.dto.specialNeeds = e.value[0].value
         },
         async loadTransportList() {
            if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
               return
            }
            let that = this;
            console.log('address', that.address, that.cacheAddressId)
            // console.log('address', that.address, that.cacheAddressId)
            if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
               that.$message.showLoading()
               const {
@@ -103,15 +233,28 @@
         },
         async submitOrder() {
            console.log('submitOrder', this.dto)
            if (!this.dto.transportId) {
               this.$message.showToast('请选择配送方式')
               return
            if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {

            } else {
               if (!this.dto.transportId) {
                  this.$message.showToast('请选择配送方式')
                  return
               }
            }

            if (!this.address.id) {
               this.$message.showToast('请选择收货地址')
               this.$message.showToast('请选择收货地址', {
                  duration: 2000
               })
               return
            }
            this.dto.addressId = this.address.id
            var goodsRecordIds = []
            if (this.dto.goodsRecordIdListStr) {
               for (var t of this.cache_goods) {
                  goodsRecordIds.push(t.id)
               }
            }

            let tmp = this
            wx.login({
@@ -125,36 +268,60 @@
                     } = await tmp.$http.request('post', '/api/customer/flower/order/commit', {
                        data: {
                           ...tmp.dto,
                           wxcode: res.code
                           wxcode: res.code,
                           goodsRecordIdList: goodsRecordIds
                        }
                     })
                     tmp.$message.hideLoading()
                     if (code === 0) {

                        //提交信息
                        console.log('pay,', data)
                        if (data && data['_testOrderId']) {
                        // /api/pub/init/callback?orderId=
                        // if(env.pro)
                        if (false && data && (data['_testV2OrderId'] || data['_testOrderId']) &&
                           environments.httpBaseUri.startsWith(
                              'http://47.99.58.211/flower')) {
                           //回调
                           tmp.$message.showLoading()
                           const res2 = await tmp.$http.request('get',
                              '/api/customer/flower/order/callback/tmp', {
                              '/api/pub/init/callback', {
                                 params: {
                                    id: res2.data['_testOrderId']
                                    orderId: data['_testV2OrderId'] || data[
                                       '_testOrderId'] || ''
                                 }
                              })
                           tmp.$message.hideLoading()
                           tmp.$message.showToast('支付成功')
                           //返回上一页
                           await tmp.$store.dispatch('sign_add', 'shopping')
                           uni.navigateBack()
                        } else if (data) {
                           wx.requestPayment({
                              ...data,
                              async success(res) {
                                 console.log('pay success', res)
                                 tmp.$message.showToast('支付成功')
                                 // tmp.$message.showToast('支付成功')
                                 //返回上一页
                                 await tmp.$store.dispatch('sign_add', 'shopping')
                                 uni.navigateBack()
                                 //清空优惠券
                                 tmp.$store.dispatch('cache_coupon_select', {})
                                 tmp.$store.dispatch('cache_goods_select', [])

                                 tmp.$message.showToast('支付成功')
                                 setTimeout(() => {
                                    uni.navigateBack()
                                 }, 500)
                                 // await 
                                 // uni.navigateBack()


                              },
                              fail(err) {
                              async fail(err) {
                                 console.error('pay fail', err)
                                 tmp.$message.showToast('支付失败')
                                 // await tmp.$store.dispatch('sign_add', 'shopping')
                                 // uni.navigateBack()
                              }
                           })

@@ -183,8 +350,8 @@
      </view>
      <view>
         <view class="flower-container m-t-12 br-4 p10">
            <view class="shopping-item m-b-20" v-for="(item,index) of dto.flowers" :key="index">
               <u-divider v-if="index>0"></u-divider>
            <view class="shopping-item " v-for="(item,index) of dto.flowers" :key="index">
               <!-- <view class="line-gray" v-if></view> -->
               <view class="sup-title flex">
                  <image class="icon-dp img100 m-r-10" src="/static/common/icon-dp.png"></image>
                  <view>{{ item.supplierName || '-' }}</view>
@@ -198,7 +365,7 @@
                           style="display: inline-block;">{{ item.levelStr || '' }}</span>{{ item.name || '-' }}
                     </view>
                     <view class="price">
                        {{ item.price || 0 }}*{{ item.num }}扎
                        {{ item.priceMember ||  item.price || 0 }}*{{ item.num }}扎
                     </view>
                     <view class="desc m-t-12">
                        <view class="m-r-15">每扎重量:{{ item.weight || 0 }}</view>
@@ -208,12 +375,43 @@
            </view>
            <view class="price">
               <view class="m-l-a m-r-0 text-right">
                  共{{ dto.flowers.length }}件，小计<span class="t-red">￥{{ dto.totalAmount || 0 }}</span>
                  共{{ dto.flowers.length }}件，小计<span
                     class="t-red">￥{{ dto.totalMemberAmount ||  dto.totalAmount || 0 }}</span>
               </view>
            </view>
         </view>
         <view class="p10 bg-white m-t-20 br-4" v-if="partnerInfo&&partnerInfo.id">
            <view class="form-item  flex ">
               <view class="label">仓位名称</view>
               <view class="m-l-a m-r-0 flex desc-gray">
                  <view>{{partnerInfo.cityWarehouse|| '-'}}</view>
               </view>
            </view>
            <view class="form-item  flex ">
               <view class="label">合伙人名称</view>
               <view class="m-l-a m-r-0 flex desc-gray">
                  <view>{{partnerInfo.name|| '-'}}</view>
               </view>
            </view>
            <view class="form-item  flex ">
               <view class="label">联系方式</view>
               <view class="m-l-a m-r-0 flex desc-gray">
                  <view>{{partnerInfo.contactTel|| '-'}}</view>
               </view>
            </view>
            <view class="form-item  flex ">
               <view class="label">提货地址</view>
               <view class="m-l-a m-r-0 flex desc-gray">
                  {{ partnerInfo['province'] || '' }}{{ partnerInfo['city'] && ('/' + partnerInfo['city']) || '' }}{{
                    partnerInfo['region'] && ('/' + partnerInfo['region']) || ''
                  }}{{partnerInfo.address|| '-'}}
               </view>
            </view>
         </view>

         <!--    查看商品列表，和选择运费 -->
         <view class="br-4 transform-container m-t-12 p10">
         <view class="br-4 transform-container m-t-12 p10"
            v-if="!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId">
            <view class="title">
               <view>运输方式：</view>
               <view class="flex transform-list flex-wrap-normal">
@@ -228,28 +426,33 @@
                  </view>
               </view>
            </view>
            <view class="m-t-20" v-if="false">
            <view class="m-t-20" v-if="true">
               <view class="desc-red">
                  10kg以下的零买订单将收取打包费，花店建议购满20kg， 可选冷链物流
               </view>
               <view class="desc">
                  预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)，第一汤下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时，顺丰送货到店。
                  优势:价格便宜，顺丰配送
                  弊端:订单必须是5kg以内
                  <!-- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)， -->
                  第一次下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时送货到店。
                  <!-- 优势:价格便宜，顺丰配送 -->
                  <!-- 弊端:订单必须是5kg以内 -->
               </view>
            </view>
         </view>

         <view class="p10 bg-white m-t-20 br-4">
            <view class="form-item  ">
               <view class="label">特殊需求</view>
               <!--       <view class="m-l-a m-r-0 flex1">
                  <view class="m-t-12 m-b-12">
                     <u-textarea v-model="dto.specialNeeds" placeholder="请输入特殊需求">
            <view class="form-item  flex ">
               <view class="label">优惠券</view>

                     </u-textarea>
                  </view>
               </view> -->
               <view class="m-l-a m-r-0 flex " :class="[!dto.couponRecordId?'desc-gray':'']"
                  @click="toSelectCoupon">
                  <view>{{dto.couponRecordStr||dto.couponRecordId || '请选择'}}</view>
                  <u-icon class="m-l-a" name="arrow-right"></u-icon>
               </view>
            </view>

            <view class="form-item  flex m-t-12">
               <view class="label">特殊需求</view>

               <view class="m-l-a m-r-0 flex " :class="[!dto.specialNeeds?'desc-gray':'']" @click="()=>{
                  show_select_need=true
               }">
@@ -261,9 +464,23 @@
               <view class="label">留言</view>
               <view class="m-l-a m-r-0 flex1">
                  <view class="m-t-12 m-b-12">
                     <u-textarea v-model="dto.remarks" placeholder="填写内容需与卖家协商并确认">
                     <u-textarea v-model="dto.remarks" clearable placeholder="填写内容需与卖家协商并确认">

                     </u-textarea>
                  </view>
               </view>
            </view>
            <view class="form-item  flex  flex-wrap-normal">
               <view class="label" style="min-width: 130rpx;">兑换券</view>

               <view class="m-l-a m-r-0 flex" style="word-break: break-all;"
                  :class="[!dto.goodsRecordIdList||dto.goodsRecordIdList.length==0?'desc-gray':'']"
                  @click="toSelectGood">
                  <view> {{dto.goodsRecordIdListStr|| '请选择'}}
                  </view>
                  <!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
                  <view style="min-width: 60rpx;">
                     <u-icon class="m-l-a" name="arrow-right"></u-icon>
                  </view>
               </view>
            </view>
@@ -274,7 +491,7 @@
         <view class="desc flex">
            <view>商品金额:</view>
            <view class="m-l-a m-r-0 text-right">
               {{ (dto.totalAmount || 0)  || 0 }}
               {{ ( dto.totalMemberAmount || dto.totalAmount || 0)  || 0 }}
            </view>
         </view>
         <view class="desc flex">
@@ -289,6 +506,14 @@
               {{ (current_transport.fee || 0) }}
            </view>
         </view>
         <view class="desc flex" v-if="cache_coupon&&cache_coupon.id">
            <view>
               优惠({{cache_coupon.couponDiscountType=='zero'?'无门槛':(cache_coupon.minOrderAmount?(`满￥${cache_coupon.minOrderAmount}可用`):'无门槛')}},优惠￥{{cache_coupon.couponDiscountValue||'0'}}):
            </view>
            <view class="m-l-a m-r-0 text-right">
               -{{ coupon_fee || 0 }}
            </view>
         </view>
      </view>


@@ -297,7 +522,8 @@
      <view class="bottom-price flex">
         <view class="m-t-12 m-l-0 m-r-a">
            合计 <span class="t-red">￥
               {{ (dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) || 0 }} </span>元
               {{ order_fee }}
            </span>元
         </view>
         <view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder">
            提交订单
@@ -318,6 +544,8 @@
         background-color: #ffffff;
         left: 0rpx;
         padding: 20rpx;
         z-index: 99;
         z-index: 11;
         right: 0rpx;
         bottom: 0rpx;
      }
@@ -326,7 +554,7 @@
         background-color: #ffffff;

         .shopping-item {
            padding: 28rpx 22rpx;
            padding: 10rpx 22rpx;
            position: relative;

            .sup-title {
@@ -402,6 +630,8 @@
         background-color: #ffffff;

         .transform-list {
            overflow-x: scroll;

            .transform-item {
               background: rgba(225, 240, 231, 0.38);
               border-radius: 8rpx;
@@ -415,6 +645,7 @@
               margin-right: auto;
               max-width: 32%;
               width: 130rpx;
               min-width: 130rpx;

               .title {
                  font-weight: 400;
@@ -422,6 +653,7 @@
                  color: #000000;
                  line-height: 40rpx;
                  word-break: break-word;
                  min-height: 90rpx
               }

               .price {
@@ -447,6 +679,9 @@
            margin-right: 0;
         }

         .desc-red {}

         .desc {}
      }

   }