Merge branch 'master' of yb/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/oms2kmall/Oms2KmallServiceImpl.java

@@ -98,8 +98,14 @@ public class Oms2KmallServiceImpl implements Oms2KmallService {
 
     @Override
     public R goodsProductAuditNotice(GoodsProductAuditResponse resp) {
+        if ("1".equals(resp.getIsAudit())) {
+            resp.setIsAudit(Dict.omsAuditStatus.item_2.getItem());
+            resp.setAuditRemark(resp.getAuditRemark() + "，请重新拉取最新备案信息。");
+        } else if ("2".equals(resp.getIsAudit())) {
+            resp.setIsAudit(Dict.omsAuditStatus.item_3.getItem());
+        }
         int count = goodsProductService.updateAuditInfo(resp.getSku(), resp.getIsAudit(), resp.getAuditTime(), resp.getAuditRemark());
-        if (count > 1) {
+        if (count > 0) {
             return R.ok();
         }
         return R.error("更新0条信息");

kmall-admin/src/main/java/com/kmall/admin/utils/oms/response/GoodsProductAuditResponse.java

@@ -1,5 +1,7 @@
 package com.kmall.admin.utils.oms.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -7,8 +9,10 @@ public class GoodsProductAuditResponse implements Serializable {
 
     private String sku;
 
+    // 1：审核成功，2：审核失败
     private String isAudit;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date auditTime;
 
     private String auditRemark;