crm更新

com.awspaas.user.apps.donenow_crm/src/com/awspaas/user/apps/donenow_crm/event/ContactFormAfterSaveEvent.java

@@ -55,7 +55,8 @@ public class ContactFormAfterSaveEvent
 				System.out.println("roleModel为空:");
 				return "";
 			}
-			RowMap map = DBSql.getMap("SELECT * FROM ORGUSER WHERE EXT5=? or (USERNAME=? AND MOBILE=?)", new Object[] { contactBo.getId(),contactBo.get("NAME"),contactBo.get("MOBILE_PHONE") });
+			String sql="SELECT * FROM ORGUSER WHERE EXT5='"+contactBo.getId()+"'";
+			RowMap map = DBSql.getMap(sql);
 			System.out.println("userMap:" +JSON.toJSONString(map));
 			System.out.println("userMap:" + (map == null));
 
@@ -72,6 +73,8 @@ public class ContactFormAfterSaveEvent
 					DBSql.update("UPDATE ORGUSER SET USERID='"+userId+"' WHERE EXT5='"+contactBo.getId()+"'");
 					UserCache.getCache().reload();
 					SDK.getORGAPI().updateUser(userId, contactBo.getString("NAME"), "", contactBo.getString("EMAIL"), contactBo.getString("MOBILE_PHONE"), "", "", "", "", contactBo.getId());
+
+					//更新联系表的USERID字段
 					contactBo.set("USERID", userId);
 					SDK.getBOAPI().update(CrmConstant.BO_EU_DNCRM_CONTACT, contactBo);
 				}
@@ -80,6 +83,7 @@ public class ContactFormAfterSaveEvent
 				System.out.println("用户新增");
 				String pinYinUserId = getPinYinUserId(contactBo.getString("NAME"));
 				SDK.getORGAPI().createUser(deptId, pinYinUserId, contactBo.getString("NAME"), roleId, "", "", false, contactBo.getString("EMAIL"), contactBo.getString("MOBILE_PHONE"), "", "", "", "", contactBo.getId());
+				////更新联系表的USERID字段
 				contactBo.set("USERID", pinYinUserId);
 				SDK.getBOAPI().update(CrmConstant.BO_EU_DNCRM_CONTACT, contactBo);
 			}
@@ -101,11 +105,15 @@ public class ContactFormAfterSaveEvent
 		return "";
 	}
 	public String getPinYinUserId(String userName) {
-
 		HanyuPinyinOutputFormat hanyuPinyinOutputFormat=new HanyuPinyinOutputFormat();
-		String  tempStr="c-";
+		String  tempStr="C-";
 		try {
-			tempStr +=  PinyinHelper.toHanyuPinyinString(userName, hanyuPinyinOutputFormat, "").replaceAll("\\d+", "");
+			String value =  PinyinHelper.toHanyuPinyinString(userName, hanyuPinyinOutputFormat, "").replaceAll("\\d+", "");
+			if(StringUtils.isNotBlank(value)) {
+				tempStr+= value.replaceAll("\\s", "");
+			}else {
+				tempStr+= userName.replaceAll("\\s", "");
+			}
 		} catch (BadHanyuPinyinOutputFormatCombination e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -118,5 +126,4 @@ public class ContactFormAfterSaveEvent
 		}
 
 	}
-
 }

com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/controller/ivtOrderController.java

@@ -742,20 +742,17 @@ public class ivtOrderController {
                 String taxCategoryId = cost.getString("TAX_CATEGORY_ID");
                 int purchaseQuantity = cost.getInt("PURCHASE_QUANTITY");
 
-// 2. 参数校验
                 if (StringUtils.isBlank(unitCostStr) || StringUtils.isBlank(taxCategoryId) || purchaseQuantity <= 0) {
                     System.err.println("无效计算参数：UNIT_COST=" + unitCostStr + "，TAX_CATEGORY_ID=" + taxCategoryId + "，PURCHASE_QUANTITY=" + purchaseQuantity);
                     throw new RuntimeException("计算不含税金额失败：参数无效");
                 }
 
-// 3. 从映射表获取税率
                 BigDecimal taxRate = taxRateMap.get(taxCategoryId);
                 if (taxRate == null) {
                     System.err.println("未知TAX_CATEGORY_ID：" + taxCategoryId);
                     throw new RuntimeException("计算不含税金额失败：未知税率ID");
                 }
 
-// 4. 计算不含税单价（含税单价 ÷ (1 + 税率)，保留2位小数）
                 BigDecimal unitCost = new BigDecimal(unitCostStr);
                 BigDecimal unitCostNotax = unitCost.divide(
                         BigDecimal.ONE.add(taxRate),
@@ -763,7 +760,6 @@ public class ivtOrderController {
                         RoundingMode.HALF_UP
                 );
 
-// 5. 计算不含税总价（不含税单价 × 采购数量，保留2位小数）
                 BigDecimal costTotalNotax = unitCostNotax.multiply(new BigDecimal(purchaseQuantity))
                         .setScale(2, RoundingMode.HALF_UP);
                 purchaseOrderProduct.set("PURCHASE_ACCOUNT_ID", cost.getString("ACCOUNT_ID"));