tj

igirl-channel/app/base/db/metadata/apps/platform.js

@@ -34,7 +34,7 @@ module.exports = {
             //订单服务付款状态   
             "order_service_pay_status": { "dfk": "待付款", "yfk": "已付款" },
             //商标交付状态
-            "delivery_status": {"dqrfa":"待确认方案", "dsccl": "待上传材料", "dsh": "待审核", "ddj": "待递交", "ydj": "已递交", "ywc": "已完成" },
+            "delivery_status": { "dqrfa": "待确认方案", "fabtg": "方案不通过", "dsccl": "待上传材料", "dsh": "待审核", "ddj": "待递交", "ydj": "已递交", "ywc": "已完成" },
             //商标类型
             "tm_type": { "p": "普通商标", "j": "集体商标", "z": "证明商标", "t": "特殊商标" },
             //商标类型形式
@@ -50,7 +50,7 @@ module.exports = {
                 "1": "商标注册申请书", "2": "商标注册申请补正通知书", "3": "商标注册申请受理通知书", "4": "商标注册申请不予受理通知书", "5": "商标注册同日申请补送使用证据通知书",
                 "6": "商标注册同日申请协商通知书商标注册同日申请抽签通知书", "7": "商标驳回通知书", "8": "商标部分驳回通知书", "9": "商标注册申请初步审定公告通知书",
                 "10": "商标异议答辩通知书", "11": "异议裁定书", "12": "纸质版商标注册证", "13": "电子版商标注册证",
-                "dsccl": "待上传材料", "dsh": "待审核", "shbtg": "审核不通过", "ddj": "待递交", "ydj": "已递交", "djyc": "递交异常"
+                "dsccl": "待上传材料", "dqrfa": "待确认方案", "fabtg": "方案不通过", "dsh": "待审核", "shbtg": "审核不通过", "ddj": "待递交", "ydj": "已递交", "djyc": "递交异常"
             },
             //申请企业类型
             "customer_type": { "ent": "企业", "person": "个人" },
@@ -68,7 +68,7 @@ module.exports = {
             "expense_type": { "gf": "官费", "sxf": "手续费", "tax": "税金", "salary": "薪酬", "sale": "销售费用", "mag": "管理费用", "channelSettleProfit": "订单渠道分润结算" },
             //凭单类型
             "direction_type": { "sr": "收", "zc": "支" },
-            "push_return_type":{"0":"推送失败","1":"推送成功"},
+            "push_return_type": { "0": "推送失败", "1": "推送成功" },
         },
     }
 }
\ No newline at end of file

igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js

@@ -1094,19 +1094,20 @@ class OrderTmProductService extends ServiceBase {
     // }
     return await self.db.transaction(async function (t) {
       var otpObj = { id: ordertmproduct.id };
+      var tmObj = { officialType: "dsh" };
       if (isConfirm == "0") {
         if (!obj.notes) {
           return system.getResultFail(-106, "方案确认失败，不通过原因不能为空");
         }
         otpObj["deliveryStatus"] = "fabtg";
         otpObj["notes"] = obj.notes;
+        tmObj.officialType = "fabtg";
       }
       if (isConfirm == "1") {
         otpObj["deliveryStatus"] = "dsh";
         otpObj["notes"] = obj.notes || "";
-        var tmObj = { deliveryOrderNo: deliveryOrderNo, officialType: "dsh" };
-        await self.trademarkDao.model.update(tmObj, { where: { deliveryOrderNo: deliveryOrderNo }, transaction: t });
       }
+      await self.trademarkDao.updateByWhere(tmObj, { where: { deliveryOrderNo: deliveryOrderNo } }, t);
       await self.dao.update(otpObj, t);
       return system.getResultSuccess();
     })