冲突

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeApplicationImpl.java

@@ -138,10 +138,10 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
         ProductLooked productLooked = sdo.toObject(ProductLooked.class);
         ProductPublishedConf productPublishedConf = sdo.toObject(ProductPublishedConf.class);
         ProductLooked looked = productLookedRepository.findByProductId(productLooked.getProductId());
-        productLooked.setProductLookedId(looked==null?null:looked.getProductLookedId());
+        productLooked.setProductLookedId(looked==null?null:looked.getProductLookedId().toString());
         productLookedRepository.save(productLooked);
-        ProductPublishedConf publishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(productPublishedConf.getProductId());
-        productPublishedConf.setProductPublishedConfId(publishedConf==null?null:publishedConf.getProductPublishedConfId());
+        ProductPublishedConf publishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(productPublishedConf.getProductId().longValue());
+        productPublishedConf.setProductPublishedConfId(publishedConf==null?null:publishedConf.getProductPublishedConfId().toString());
         productPublishedConfRepository.save(productPublishedConf);
 
         return idMap;

topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 
 @Controller
@@ -99,7 +100,7 @@ public class ProofingApplyController extends CommonController {
         SDO sdo = this.getSDO();
         String productId = sdo.getString("productId");
         ProductLooked productLooked = new ProductLooked();
-        productLooked.setProductId(Long.valueOf(productId));
+        productLooked.setProductId(productId);
         ProductLooked newProductLooked = productLookedApplication.getProductLookedByEntity(productLooked);
         return toResult(newProductLooked);
     }