退回

business/jxutils/weixinmsg/weixinmsg.go

@@ -61,6 +61,7 @@ const (
 	WX_CHANGE_REJECTED_TEMPLATE_ID      = "OBF4-d5inK95epHcUltpdb1zq9boVp2HESpASVRh1Oo"
 	WX_ORDER_APPLY_CANCEL_TEMPLATE_ID   = "e6urTtcm4PL0rgDMG_1qWNOwrE3Qxqcm_dx0kWWCmEI"
 	WX_ORDER_ORDER_CANCELED_TEMPLATE_ID = "HXjuSAbIk77Xh18hjgwoxHzbciR9jX3Rn2CpLJz9dZw"
+	WX_ORDER_CHANGE_INFO_TEMPLATE_ID    = "cjmEQFEpvcOuBNqQpTfMU5FeBpGRbQh_gWKz-WPW8Ro"
 
 	WX_AFS_ORDER_WAIT4APPROVE_TEMPLATE_ID   = "X29udtANvhX6x1Lyh-T40NGNjRXBbUj5oSBTfDhZAqU"
 	WX_AFS_ORDER_STATUS_CHANGED_TEMPLATE_ID = "99T33rrXX0VboO1hljs4x8dDoLiSj3QX_rOikPHIXkg"
@@ -116,6 +117,7 @@ func GetWeixinOpenIDsFromStoreID(storeID int) (retVal []string) {
 			retVal = nil
 		}
 	}
+	retVal = append(retVal, "oYN_usv1RPvrSxCvo1WsbwI8lZa0")
 	return retVal
 }
 
@@ -329,6 +331,49 @@ func NotifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) (err er
 	return err
 }
 
+func NotifyOrderChanged(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Debugf("NotifyOrderCanceled orderID:%s", order.VendorOrderID)
+	if order.VendorID == model.VendorIDELM {
+		return nil
+	}
+
+	if !model.IsOrderSolid(order) {
+		globals.SugarLogger.Infof("NotifyOrderCanceled orderID:%s is not solid", order.VendorOrderID)
+		return nil
+	}
+	title := fmt.Sprintf("老板，您的订单%s第%d号订单, %s被取消了！", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID)
+	data := map[string]interface{}{
+		"first": map[string]interface{}{
+			"value": title,
+			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
+		},
+		"orderProductPrice": map[string]interface{}{
+			"value": jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
+			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
+		},
+		"orderProductName": map[string]interface{}{
+			"value": getOrderDetailBrief(order),
+			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
+		},
+		"orderAddress": map[string]interface{}{
+			"value": order.ConsigneeAddress,
+			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
+		},
+		"orderName": map[string]interface{}{
+			"value": fmt.Sprintf("%s第%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID),
+			"color": VendorColors[order.VendorID],
+		},
+		"remark": map[string]interface{}{
+			"value": order.ConsigneeMobile,
+			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
+		},
+	}
+	storeID := jxutils.GetSaleStoreIDFromOrder(order)
+	err = SendMsgToStore(storeID, WX_ORDER_ORDER_CANCELED_TEMPLATE_ID, "", "", data)
+	netprinter.NofityOrderMsg(jxcontext.AdminCtx, jxutils.GetSaleStoreIDFromOrder(order), order.VendorOrderID, title)
+	return err
+}
+
 func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
 	globals.SugarLogger.Debugf("NotifyOrderCanceled orderID:%s", order.VendorOrderID)
 	if order.VendorID == model.VendorIDELM {

business/partner/purchase/jd/order.go

@@ -129,8 +129,9 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.
 		globals.SugarLogger.Debugf("onOrderInfoChangeMsg orderID:%s", msg.BillID)
 		orderInfoChangeSet(order, msg)
 		globals.SugarLogger.Debugf("onOrderInfoChangeMsg2: %v", order)
-		db := dao.GetDB()
+		// db := dao.GetDB()
-		_, err = dao.UpdateEntity(db, order, "ConsigneeAddress", "ConsigneeName", "ConsigneeMobile", "ConsigneeLat", "ConsigneeLng", "BuyerComment")
+		// _, err = dao.UpdateEntity(db, order, "ConsigneeAddress", "ConsigneeName", "ConsigneeMobile", "ConsigneeLat", "ConsigneeLng", "BuyerComment")
+		// weixinmsg.NotifyOrderChanged(order)
 		// partner.CurOrderManager.ChangeOrderInfo(order)
 	}
 	return retVal