feat: 支付回调 账户

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

@@ -53,7 +53,7 @@ func (this *PayStruct) PurchaseUserBalance() (bool, error) {
 		"endTime":      []string{this.EndTime},
 		"remarks":      []string{string(remarkBytes)},
 		"appId":        []string{this.AppId},
-		"vipTime":      []string{fmt.Sprint("%v", this.VipTime)},
+		"vipTime":      []string{fmt.Sprintf("%v", this.VipTime)},
 	}
 	rmap, err := commonPost(config.JyApiConfig.ApiList.BuyBalance, param)
 	log.Println("BuyBalance post err: ", rmap, err)

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

@@ -109,7 +109,7 @@ func (this *resoucePackStruct) Filter(product, userid, lotteryId, discountId str
 		if price == 0 {
 			msg = "金额校验异常"
 		}
-		filter["validTime"] = this.LastDate(time.Now()).Format("2006.01.02")
+		filter["validTime"] = this.LastDate(time.Now()).Format("2006-01-02")
 		rs = ReturnStruct{Filter: filter, Price: price, OrderMoney: price}
 	}
 

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

@@ -106,6 +106,10 @@ func (this *PayCallBackAction) TestPay() {
 		if entity.AreaPackPrice.PayCallBack(thisParam) {
 			success = true
 		}
+	case "附件下载包":
+		if entity.JyresoucePack.PayCallBack(thisParam) {
+			success = true
+		}
 	default:
 		typeFlag = "未知类型"
 	}
@@ -213,6 +217,11 @@ func (a *PayCallBackAction) AliPayCallback() {
 				log.Println("支付宝个人数据包支付回调更新执行出错 %+v\n", thisParam)
 				return false
 			}
+		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_FILEPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_FILEPACK_NATIVE) {
+			if !entity.JyresoucePack.PayCallBack(thisParam) {
+				log.Println("支付宝附件下载包支付回调更新执行出错 %+v\n", thisParam)
+				return false
+			}
 		} else {
 			log.Printf("支付宝支付完成回调 未知订单类型%s\n", thisParam.OutTradeno)
 		}
@@ -308,6 +317,10 @@ func (p *PayCallBackAction) WxPayCallback() {
 			if update = entity.AreaPackPrice.PayCallBack(thisParam); !update {
 				log.Printf("微信个人数据包支付回调更新执行出错 %+v\n", thisParam)
 			}
+		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_FILEPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_FILEPACK_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_FILEPACK_NATIVE) { //附件下载包
+			if update = entity.JyresoucePack.PayCallBack(thisParam); !update {
+				log.Printf("微信附件下载包支付回调更新执行出错 %+v\n", thisParam)
+			}
 		} else {
 			log.Printf("微信支付完成回调 未知订单类型%s\n", thisParam.OutTradeno)
 		}

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

@@ -1,6 +1,7 @@
 package service
 
 import (
+	. "api"
 	"config"
 	"encoding/json"
 	"entity"
@@ -21,6 +22,7 @@ type ResourcePack struct {
 	*xweb.Action
 	tes         xweb.Mapper `xweb:"/tes"`                      //测试
 	createOrder xweb.Mapper `xweb:"/resourcePack/createOrder"` //线上自助数据包充值-创建订单
+	account     xweb.Mapper `xweb:"/resourcePack/account"`     //个人账户
 }
 
 const (
@@ -132,3 +134,35 @@ func (this *ResourcePack) CreateOrder() {
 	return
 
 }
+
+// @Summary 账户信息
+// @Param product产品类型【dataExportPack、attachmentDownPack】
+// @Success"{"status":1,"order_code":123456789,"msg":"创建成功"}"
+// @Router /jypay/resourcePack/account [post]
+func (this *ResourcePack) Account() {
+	defer qu.Catch()
+	if this.Method() != METHOD {
+		this.ServeJson(Result{Error_msg: "请求方式有误"})
+		return
+	}
+	userId, _ := this.GetSession("userId").(string)
+	if userId == "" {
+		this.ServeJson(Result{Error_msg: "未登录"})
+		return
+	}
+	product := this.GetString("product")
+	if config.ResConf.Product[product] == "" {
+		this.ServeJson(Result{Error_msg: "参数错误"})
+		return
+	}
+	dbs := &entity.FindBalanceStruct{
+		AccountId:    userId,
+		ResourceType: config.ResConf.Product[product],
+	}
+	data, err := dbs.FindBalance()
+	if err != nil {
+		this.ServeJson(Result{Error_msg: "获取失败"})
+		return
+	}
+	this.ServeJson(Result{Data: data})
+}