123

business/partner/purchase/jx/localjx/order.go

@@ -584,8 +584,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
 				storeOrder.OrderFinishedAt = time.Now()
 				storeOrder.Status = model.OrderStatusFinished
 				if _, err = dao.UpdateEntity(dao.GetDB(), storeOrder, "OrderFinishedAt", "Status"); err == nil {
-					brandID, _ := dao.GetStoreBrandID(dao.GetDB(), storeOrder.StoreID)
-					partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, brandID, storeOrder.ActualPayPrice, 1, 1, "")
+					partner.CurStoreAcctManager.InsertStoreAcctIncomeAndUpdateStoreAcctBalance(nil, storeOrder.StoreID, storeOrder.ActualPayPrice, partner.StoreAcctTypeIncomePay, orderPay.VendorOrderID, 0)
 				}
 			}
 		case model.PayTypeTL_BrandBillCharge:
@@ -603,6 +602,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
 			priceDefendOrders, _ := dao.GetPriceDefendOrder(dao.GetDB(), orderPay.VendorOrderID, nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, 0, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false)
 			if len(priceDefendOrders) > 0 {
 				priceDefendOrders[0].IsPay = model.YES
+				dao.UpdateEntity(dao.GetDB(), priceDefendOrders[0], "IsPay")
 				err = nil
 			}
 		}

business/partner/purchase/jx/localjx/order_test.go

@@ -0,0 +1,26 @@
+package localjx
+
+import (
+	"testing"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/globals/testinit"
+)
+
+func init() {
+	testinit.Init()
+}
+
+func TestGenOrderNo(t *testing.T) {
+	orderNo := GenOrderNo(jxcontext.AdminCtx)
+	t.Log(orderNo)
+}
+
+func TestGetAvailableDeliverTime(t *testing.T) {
+	timeInfo, err := GetAvailableDeliverTime(jxcontext.AdminCtx, 100118)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(utils.Format4Output(timeInfo, false))
+}