CartServiceImpl.java

1.查询购物车是否已存在，改为按sOrgNO、sShopNO、nTag、sAgentContractNO、nGoodsID、sSaleUnit来检查唯一性
2.购物车更新增加了sPromoPaperNO和sPromoGroupNO

src/main/java/com/egolm/shop/api/service/impl/CartServiceImpl.java

@@ -103,13 +103,15 @@ public class CartServiceImpl implements CartService {
 					strs.add("(sPromoGroupNO = '' or sPromoGroupNO is null)");
 				}
 				
-				//查询购物车是否已存在，改为按sOrgNO、sShopNO、nTag、sAgentContractNO、nGoodsID来检查唯一性
+				//查询购物车是否已存在，改为按sOrgNO、sShopNO、nTag、sAgentContractNO、nGoodsID、sSaleUnit来检查唯一性
+				//modify by hanhan 2024-08-23 10:29:53
                 List<String> strQuery = new ArrayList<String>();
                 strQuery.add("sShopNO = '" + shopNO + "'");
                 strQuery.add("sAgentContractNO = '" + sAgentContractNO + "'");
                 strQuery.add("nGoodsID = " + nGoodsID);
                 strQuery.add("sOrgNO = '" + orgNo + "'");
                 strQuery.add("nTag = " + nGoodsTypeID); 
+				strQuery.add("sSaleUnit = '" + sSaleUnit + "'");
 				
 				List<Map<String, Object>> list = jdbcTemplate.queryForList("select nIdx, nSaleQty, sPromoPaperNO from tCart" + StringUtil.join(" and ", " where ", "", strQuery));
 				if(list.size() == 0) {
@@ -118,7 +120,9 @@ public class CartServiceImpl implements CartService {
 				} else {
 					Integer nIdx = Util.objTo(list.get(0).get("nIdx"), Integer.class);
 					Double nQty = Util.objTo(list.get(0).get("nSaleQty"), Double.class);
-					jdbcTemplate.executeUpdate("update tCart set nSaleQty = " + (nSaleQty + nQty) + ", nSetPrice = ? ,sSaleUnit = ?,nSaleBigQty =?  where sOrgNO = ? and sShopNO = ? and nIdx = ?", nSetPrice,sSaleUnit,saleBigQty, orgNo, shopNO, nIdx);
+					//购物车更新增加了sPromoPaperNO和sPromoGroupNO
+					//modify by hanhan 2024-08-23 10:29:53
+					jdbcTemplate.executeUpdate("update tCart set nSaleQty = " + (nSaleQty + nQty) + ", nSetPrice = ? ,sSaleUnit = ?,nSaleBigQty =?,sPromoPaperNO = ?,sPromoGroupNO = ?  where sOrgNO = ? and sShopNO = ? and nIdx = ?", nSetPrice,sSaleUnit,saleBigQty, sPromoPaperNO, sPromoGroupNO, orgNo, shopNO, nIdx);
 				}
 					
 			}