提交

api/v1/projects.go

@@ -2,7 +2,6 @@ package v1
 
 import (
 	"encoding/json"
-	"log"
 	"sfbase/global"
 	"sfis/middleware"
 	"sfis/model/response"
@@ -87,7 +86,6 @@ func getProjectDetail(c *gin.Context) {
 	bs, _ := json.Marshal(p)
 	param := string(bs)
 	global.Logger.Info("api getProjectDetail:", zap.Any("productID:", productID), zap.Any("appID", appID), zap.Any("param:", param))
-	log.Println("项目id：", id)
 	if id != "" {
 		utils.Check(appID, productID, c, func() ([]map[string]interface{}, int, error) {
 			return service.ProjectDetailData(id)

manage/user/userRecharge.go

@@ -14,17 +14,22 @@ func moneyRecharge(c *gin.Context) {
 	appid := c.PostForm("appid")
 	money, err := strconv.Atoi(c.PostForm("money"))
 	remark := c.PostForm("remark")
+	discount := 0
+	if c.PostForm("discount") != "" {
+		discount, err = strconv.Atoi(c.PostForm("discount"))
+	}
 	if err != nil {
 		response.FailWithDetailed(response.ParamError, nil, "参数错误", c)
 		return
 	}
 	p := gin.H{
-		"appid":  appid,
-		"money":  money,
-		"remark": remark,
+		"appid":    appid,
+		"money":    money,
+		"remark":   remark,
+		"discount": discount,
 	}
 	global.Logger.Info("api moneyRecharge:", zap.Any("param:", p))
-	errs := service.MoneyRecharge(appid, money, remark)
+	errs := service.MoneyRecharge(appid, money, remark, discount)
 	if errs == nil {
 		response.Ok(c)
 	} else {

service/userRecharge.go

@@ -11,7 +11,7 @@ import (
 	"time"
 )
 
-func MoneyRecharge(appid string, money int, remark string) error {
+func MoneyRecharge(appid string, money int, remark string, discount int) error {
 	//取出用户锁
 	lock.MainLock.Lock()
 	userLock := lock.UserLockMap[appid]
@@ -26,15 +26,25 @@ func MoneyRecharge(appid string, money int, remark string) error {
 	errs := db.GetSFISDB().Transaction(func(tx *gorm.DB) error {
 		moneyBefore := userAccount.Money
 		moneyAfter := userAccount.Money + money
+		var err error
+		//修改折扣discount
+		if discount != 0 {
+			err = tx.Exec("update user_product set discount = ? WHERE `app_id` = ?", discount, appid).Error
+			if err != nil {
+				log.Printf("appID:[%s],money:[%d] execute cost user_account error:[%v]", appid, moneyAfter, err)
+				tx.Rollback()
+				return err
+			}
+		}
 		//充值
-		err := tx.Exec("update user_account set money = ?,update_at = ? WHERE `app_id` = ?", moneyAfter, nowStr,appid).Error
+		err = tx.Exec("update user_account set money = ?,update_at = ? WHERE `app_id` = ?", moneyAfter, nowStr, appid).Error
 		if err != nil {
 			log.Printf("appID:[%s],money:[%d] execute cost user_account error:[%v]", appid, moneyAfter, err)
 			tx.Rollback()
 			return err
 		}
 		//生充值记录
-		err = tx.Exec("insert into user_money_record (app_id,`before`,`after`,trade_money,remark,create_at) values (?,?,?,?,?,?)", appid, moneyBefore, moneyAfter, money, remark,nowStr).Error
+		err = tx.Exec("insert into user_money_record (app_id,`before`,`after`,trade_money,remark,create_at) values (?,?,?,?,?,?)", appid, moneyBefore, moneyAfter, money, remark, nowStr).Error
 		if err != nil {
 			log.Printf("appID:[%s],trade_money:[%d] execute insert into user_money_record error:[%v]", appid, money, err)
 			tx.Rollback()

static/templates/chooseProduct.html

@@ -120,7 +120,7 @@
                         }
                         $('.box').html(str);
                     } else {
-
+                        $(".result").html(r.msg)
                     }
                 }
             })

static/templates/moneyRecharge.html

@@ -11,6 +11,7 @@
     <div id="money">
         <input type="number" id="moneys" placeholder="请输入充值金额">
         <input type="text" id="remark" placeholder="请输入备注信息">
+        <input type="text" id="discount" placeholder="请输入折扣（1-10）">
         <button type="button" id="moneyBtn">提交</button>
     </div>
     <div id="resultContent"></div>
@@ -19,6 +20,7 @@
     </html>
     <script>
         var appid = getParam("appId");
+
         // 获取上个页面传来的参数
         function getParam(name) {
             var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
@@ -30,6 +32,7 @@
             r = null;
             return context == null || context == "" || context == "undefined" ? "" : context;
         }
+
         function submit(param, rType, url, hearders) {
             $.ajax({
                 url: url,
@@ -51,7 +54,8 @@
             var param = {
                 "appid": appid,
                 "money": Math.round($("#moneys").val() * 100),
-                "remark":$("#remark").val(),
+                "remark": $("#remark").val(),
+                "discount": $("#discount").val(),
             };
             var url = "/manage/user/moneyRecharge";
             var rType = "post";