fix 区分第三方商品

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSpuInsert.java

@@ -179,4 +179,9 @@ public class ReqGoodsSpuInsert {
      * 是否开启订阅提醒
      */
     private Boolean isSubscribeAlert;
+
+    /**
+     * 是否是第三方商品
+     */
+    private Boolean isThirdGoods;
 }

netflix-dao/src/main/java/com/cyksj/model/manage/views/GoodsDonViewer.java

@@ -233,6 +233,12 @@ public class GoodsDonViewer {
     @DbField("g.is_subscribe_alert")
     private Boolean isSubscribeAlert;
 
+    /**
+     * 是否是第三方商品
+     */
+    @DbField("g.is_third_goods")
+    private Boolean isThirdGoods;
+
     @DbIgnore
     private List<Long> recommendGoodsList;
 }

netflix-service/src/main/java/com/cyksj/service/mange/goods/GoodsDonCategoryServiceImpl.java

@@ -87,7 +87,7 @@ public class GoodsDonCategoryServiceImpl extends ServiceImpl<GoodsDonCategoryMap
 	@Override
 	public void handleGoodsRelate(Long goodsId, List<Long> categoryList) {
 		//更新第三方平台信息
-		updateThirdGoodsInfo(goodsId, categoryList);
+//		updateThirdGoodsInfo(goodsId, categoryList);
 
 		if (CollUtil.isEmpty(categoryList)) {
 			goodsDonCategoryRelateMapper.delete(Wrappers.lambdaQuery(GoodsDonCategoryRelate.class).eq(GoodsDonCategoryRelate::getGoodsId, goodsId));

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -634,7 +634,7 @@ public class CmsAccountController {
 		//排除不需要填写账号的平台
 	    if (StrUtil.isNotBlank(updateAccount)){
 			long userId = StpUtil.getLoginIdAsLong();
-			if (!db.getPassword().equals(account.getPassword())) {
+			if (!account.getPassword().equals(db.getPassword())) {
 				account.setCustomerServiceId(0l);
 				accountService.saveRecord(userId, account.getId(), db.getPassword(), account.getPassword(), "操作编辑");
 
@@ -644,7 +644,7 @@ public class CmsAccountController {
 						.eq(UserTicketClearedRecord::getAccountId, account.getId()));
 				isClear = true;
 			}
-			if (!db.getAccount().equals(account.getAccount())){
+			if (!account.getAccount().equals(db.getAccount())){
 				account.setAccount(account.getAccount().trim());
 				//账号是否已经添加过
 				if (!account.getAccount().contains("客服")) {