xiugai

src/order/optimizeOrder.go

@@ -1,7 +1,9 @@
 package order
 
 import (
+	"mongodb"
 	qutil "qfw/util"
+	"strings"
 	"util"
 
 	"github.com/baiy/Cadmin-server-go/admin"
@@ -35,3 +37,36 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 	})
 	return map[string]interface{}{"status": 1}, nil
 }
+
+func FindUserAccount(context *admin.Context) (interface{}, error) {
+	param := new(struct {
+		Phone string `form:"phone"`
+	})
+	err := context.Form(param)
+	if err != nil {
+		return nil, err
+	}
+	// var userData, ok, userId = &map[string]interface{}{}, false, ""
+	userData, ok := util.MQFW.Find("user", map[string]interface{}{
+		"i_appid": 2,
+		"$or": []map[string]interface{}{
+			{"s_phone": param.Phone},
+			{"s_m_phone": param.Phone}},
+	}, `{"s_phone":-1}`, `{"s_phone":1,"s_m_phone":1,"_id":1,"s_nickname":1}`, false, -1, -1)
+	if userData != nil && len(*userData) > 0 && ok {
+		for _, v := range *userData {
+			s_m_phone := qutil.ObjToString(v["s_m_phone"])
+			s_phone := qutil.ObjToString(v["s_phone"])
+			regTypeArr := []string{}
+			if s_phone != "" {
+				regTypeArr = append(regTypeArr, "APP")
+			}
+			if s_m_phone != "" {
+				regTypeArr = append(regTypeArr, "微信")
+			}
+			v["regType"] = strings.Join(regTypeArr, ",")
+			v["_id"] = mongodb.BsonIdToSId(v["_id"])
+		}
+	}
+	return map[string]interface{}{"data": userData}, nil
+}

src/order/orderManageController.go

@@ -599,8 +599,8 @@ func ConfirmRefund(context *admin.Context) (interface{}, error) {
 		})
 		if okid > 0 {
 			orderData := util.JysqlDB.SelectBySql("select  (IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code) as outstandingPayment,(IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0)) as moneys from dataexport_order a where  a.order_code=?", orderCode)
-			outstandingPayment = qutil.IntAll((*orderData)["outstandingPayment"]) //未回款金额
-			moneys = qutil.IntAll((*orderData)["moneys"])                         //应收金额
+			outstandingPayment := qutil.IntAll((*orderData)[0]["outstandingPayment"]) //未回款金额
+			moneys := qutil.IntAll((*orderData)[0]["moneys"])                         //应收金额
 			if outstandingPayment == moneys {
 				param.RefundStatus = 1
 			} else if 0 < outstandingPayment && outstandingPayment < moneys {

src/order/router.go

@@ -130,6 +130,7 @@ func init() {
 		"Baiy.Cadmin.Order.logicalDelOrder":                   LogicalDelOrder,
 		"Baiy.Cadmin.Order.helpUserOrders":                    orderList,
 		"Baiy.Cadmin.Order.createUserAccount":                 CreateUserAccount,
+		"Baiy.Cadmin.Order.findUserAccount":                   FindUserAccount,
 		"Baiy.Cadmin.Order.vipGives":                          VipGives,
 		"Baiy.Cadmin.Order.copyLink":                          CopyLink,
 		"Baiy.Cadmin.Order.addUpdateRecord":                   AddUpdateRecord,