Merge branch 'dev4.6.1.2' of http://192.168.3.207:8080/qmx/jy into dev4.6.1.2

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -89,6 +89,7 @@ type VipSimpleMsg struct {
 	OriginalPrice    int                      `json:"original_price,omitempty"` //双十一活动原价价格
 	GiveType         int                      `json:"give_type,omitempty"`      //赠送周期 类型 1天 2月
 	DisCountId       int                      `json:"discountId,omitempty"`     //赠送的id
+	Badge            string                   `json:"badge,omitempty"`          //活动标识
 }
 
 //购买内容
@@ -540,7 +541,7 @@ func (this *vipSubscribeStruct) GetSubVipPriceByBuySet(buySet *SubvipBuySet, cou
 		pCount := buySet.AreaCount            //省份数量
 		industryNum := buySet.BuyerclassCount //行业数量
 		newCityArr := []int{}                 //选择城市数量 防止操作cityCountArr 影响原数据
-		if buySet.Upgrade != 1 { //未升级超级订阅计价规则
+		if buySet.Upgrade != 1 {              //未升级超级订阅计价规则
 			//城市选择过多时，转为省份
 			for _, cityCount := range buySet.NewCitys {
 				if cityCount > SubVipPrice.Old.CityMaxCount {

src/jfw/modules/subscribepay/src/service/vipSubscribePay.go

@@ -193,10 +193,13 @@ func (this *SubVipPayOrder) CreateOrder() {
 		discountId, _ := this.GetInteger("discountId")
 		if discountId > 0 {
 			isgive = true
-			timeNum, timeType := util.GiveInfo(userId, useProduct, 0, discountId) //获取满赠时长
+			timeNum, timeType, activityName := util.GiveInfo(userId, useProduct, 0, discountId) //获取满赠时长
 			filter.GiveCycle = timeNum
 			filter.GiveType = timeType
 			filter.DisCountId = discountId
+			if strings.Contains(activityName, config.Config.ActivityName) {
+				filter.Badge = "202111" //双十一角标展示
+			}
 		}
 		filterStr, _ := json.Marshal(filter)
 		insertMap := map[string]interface{}{
@@ -351,10 +354,13 @@ func (this *SubVipPayOrder) Renew() {
 		discountId, _ := this.GetInteger("discountId")
 		useProduct, _ := this.GetInteger("useProduct")
 		if discountId > 0 && useProduct > 0 {
-			timeNum, timeType := util.GiveInfo(userId, useProduct, 0, discountId) //获取满赠时长
+			timeNum, timeType, activityName := util.GiveInfo(userId, useProduct, 0, discountId) //获取满赠时长
 			filter.GiveCycle = timeNum
 			filter.GiveType = timeType
 			filter.DisCountId = discountId
+			if strings.Contains(activityName, config.Config.ActivityName) {
+				filter.Badge = "202111" //双十一角标展示
+			}
 		}
 		mog_id := entity.JyVipSubStruct.SaveSelectLog(userId, openId, &filter)
 		if mog_id == "" {

src/jfw/modules/subscribepay/src/util/coupon.go

@@ -129,9 +129,10 @@ func UpdateCouponState(userId, userLotteryId, nickName, phone, orderCode, usePro
 return:
 	timeNum:赠送数量
 	timeType:时间类型：1/天、2/月
+	activityName:活动名称
 	查看赠品天数接口
 */
-func GiveInfo(userid string, useProduct, useProductType, discountId int) (timeNum, timeType int) {
+func GiveInfo(userid string, useProduct, useProductType, discountId int) (timeNum, timeType int, activityName string) {
 	getUrl := fmt.Sprintf("%s?useProduct=%s&appId=%s&useProductType=%v&userId=%s", config.CouponConfig.Giveinfo, strconv.Itoa(useProduct), config.CouponConfig.AppId, useProductType, userid)
 	log.Println(getUrl)
 	res, err := http.Get(getUrl)
@@ -153,6 +154,7 @@ func GiveInfo(userid string, useProduct, useProductType, discountId int) (timeNu
 					if qutil.IntAll(v["DiscountId"]) == discountId {
 						timeNum = qutil.IntAll(v["Time"])
 						timeType = qutil.IntAll(v["TimeType"])
+						activityName = qutil.ObjToString(v["ActivityName"])
 					}
 				}
 			}

src/web/staticres/common-module/order-list/js/order-detail.js

@@ -453,7 +453,7 @@ var vm = new Vue({
       }
 	  var payNum = filterInfo.pNum + '条'
 	  if(filterInfo.give_cycle){
-		payNum += '<span class="highlight-text">&nbsp增' +	filterInfo.give_cycle + '条</span>'
+		payNum += '<span class="highlight-text">&nbsp赠' +	filterInfo.give_cycle + '条</span>'
 	  }
       return [
         {

src/web/staticres/common-module/order-list/js/order-list.js

@@ -1339,6 +1339,7 @@ var vm = new Vue({
         }
         giveHTML = `&nbsp;+&nbsp;<span class="highlight-text">赠送${give}</span>`
       }
+    	console.log(info)
       // 计算有效日期
       var dateText = ''
       if (order.order_status === 1) {
@@ -1625,7 +1626,7 @@ var vm = new Vue({
             effectiveduration_vip = month + "个月";
           }
           //试用用户生成订单 周期
-          if (effectiveduration_vip === "") {
+          //if (effectiveduration_vip === "") {
             if (cycleunit_vip === 1) {
               effectiveduration_vip = cyclecount_vip + "年";
             } else if (cycleunit_vip === 2) {
@@ -1635,7 +1636,7 @@ var vm = new Vue({
             } else if (cycleunit_vip === 4) {
               effectiveduration_vip = cyclecount_vip + "季";
             }
-          }
+          //}
         } else {
           if (cycleunit_vip === 1) {
             effectiveduration_vip = cyclecount_vip + "年";
@@ -1977,7 +1978,7 @@ var vm = new Vue({
       var filterInfo = JSON.parse(order.filter)
     	  var payNum = filterInfo.pNum + '条'
 	  if(filterInfo.give_cycle){
-		payNum += '<span class="highlight-text">&nbsp增' +	filterInfo.give_cycle + '条</span>'
+		payNum += '<span class="highlight-text">&nbsp赠' +	filterInfo.give_cycle + '条</span>'
 	  }
       var prodType = {
         label: '产品类型',