x

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

@@ -254,22 +254,18 @@ public class AddressServiceImpl implements AddressService {
 				+ " from tCustAddress where nTag&1 = 0 and sCustNO = ? and (sShopNO = ? or sShopNO is null or sShopNO = '') order by nTag desc, dLastUpdateTime desc";
 		List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, custNo, shopNo);
 		Map<String, Object> defMap = null;
-		Integer nTag_Cur = 0;
 		for(Map<String, Object> map : list) {
 			Integer nTag = (Integer)map.get("nTag");
 			if(nTag != null) {
 				if((nTag&6) == 6) {
 					defMap = map;
-					break;
-				} else if((nTag&4) == 4 && nTag_Cur < 4) {
+				} else if((nTag&2) == 2) {
 					defMap = map;
-				} else if((nTag&4) == 2 && nTag_Cur < 2) {
+				} else if((nTag&4) == 4) {
 					defMap = map;
 				}
-				nTag_Cur = nTag;
 			}
 		}
-		
 		if(defMap == null && list.size() > 0) {
 			defMap = list.get(0);
 		}

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

@@ -244,6 +244,12 @@ public class OrderServiceImpl implements OrderService {
 		return Rjx.jsonOk().set("list", subList).toJson();
 	}
 	
+	public static void main(String[] args) {
+		BigDecimal nPayAmount = new BigDecimal("30239");
+		nPayAmount = nPayAmount.multiply(new BigDecimal(0.01)).setScale(2, BigDecimal.ROUND_HALF_UP);
+		System.out.println(nPayAmount);
+	}
+
 	@Override
 	@Transactional
 	public void paySuccess(String sSalesOrderID, BigDecimal nPayAmount, String sOpenID, String sTransTraceNO, String sOutTradeNO, Date dPayDateTime) {