优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -712,8 +712,8 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                     tradeDetailDO.setUseDate(orderDetail.getBoardingTime() == null ? DateUtil.toLocalDateTime(tradeOrderDO.getTravelDate()) : DateUtil.toLocalDateTime(orderDetail.getBoardingTime()));
                     tradeDetailDO.setProductId(product.getId());
                     tradeDetailDO.setProductName(product.getProductName());
-                    tradeDetailDO.setPrice(orderDetail.getOriginPrice());
-                    tradeDetailDO.setActualPrice(orderDetail.getPrice());
+                    tradeDetailDO.setPrice(orderDetail.getOriginPrice()==null?BigDecimal.ZERO:orderDetail.getOriginPrice());
+                    tradeDetailDO.setActualPrice(orderDetail.getPrice()==null?BigDecimal.ZERO:orderDetail.getPrice());
                     tradeDetailDO.setValidityStartDate(LocalDateTimeUtil.of(orderDetail.getBoardingTime()));
                     tradeDetailDO.setValidityEndDate(LocalDateTimeUtil.of(orderDetail.getLeaveTime()));
                     tradeDetailDO.setSpecType(orderDetail.getSpecType());
@@ -787,8 +787,8 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                     tradeDetailDO.setUseDate(orderItem.getUseDate() == null ? DateUtil.toLocalDateTime(tradeOrderDO.getTravelDate()) : DateUtil.toLocalDateTime(orderItem.getUseDate()));
                     tradeDetailDO.setProductId(product.getId());
                     tradeDetailDO.setProductName(product.getProductName());
-                    tradeDetailDO.setPrice(orderDetail.getOriginPrice());
-                    tradeDetailDO.setActualPrice(orderDetail.getPrice());
+                    tradeDetailDO.setPrice(orderDetail.getOriginPrice()==null?BigDecimal.ZERO:orderDetail.getOriginPrice());
+                    tradeDetailDO.setActualPrice(orderDetail.getPrice()==null?BigDecimal.ZERO:orderDetail.getPrice());
                     tradeDetailDO.setSpecType(orderDetail.getSpecType());
                     tradeDetailDO.setId(IdWorker.getId());
                     tradeDetailDO.setProductType(orderDetail.getProductType());
@@ -1302,7 +1302,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             return;
         }
         TradeDetailDO tradeDetailDO = tradeOrderDetailBOList.get(0).getTradeDetailDOList().get(0);
-        tradeDetailDO.setActualPrice(tradeDetailDO.getActualPrice().add(subAmount));
+        tradeDetailDO.setActualPrice(tradeDetailDO.getActualPrice()==null?BigDecimal.ZERO: tradeDetailDO.getActualPrice().add(subAmount));
         TradeDetailBaseDO tradeDetailBaseDO = tradeOrderDetailBOList.get(0).getTradeDetailBaseDOList().stream().filter(item -> ObjectUtil.equal(item.getDetailId(), tradeDetailDO.getId())).findFirst().orElse(null);
         Asserts.isTrue(tradeDetailBaseDO != null, "数据异常");
         if (tradeDetailBaseDO != null) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/utils/MD5Utils.java

@@ -0,0 +1,63 @@
+package com.yc.ship.module.trade.utils;
+
+import java.security.MessageDigest;
+
+public class MD5Utils {
+	
+	private final static char[] hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+			'a', 'b', 'c', 'd', 'e', 'f' };
+	
+	public static String MD5(String s) {
+		
+		try {
+			byte[] strTemp = s.getBytes("utf-8");
+			MessageDigest mdTemp = MessageDigest.getInstance("MD5"); 
+			mdTemp.update(strTemp);
+			byte[] md = mdTemp.digest();
+			int j = md.length;
+			char[] str = new char[j * 2];
+			int k = 0;
+			for (int i = 0; i < j; i++) {
+				byte byte0 = md[i];
+				str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+				str[k++] = hexDigits[byte0 & 0xf];
+			}
+			return new String(str);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	/**
+	 *生成md5
+	 *@param source
+	 * @return
+	 */
+	public static String getMD5(byte[] source) {
+		String s = null;
+		char[] hexDigits = { // 用来将字节转换成 16 进制表示的字符
+				'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+		try {
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			md.update(source);
+			byte[] tmp = md.digest();          // MD5 的计算结果是一个 128 位的长整数，
+			// 用字节表示就是 16 个字节
+			char[] str = new char[16 * 2];   // 每个字节用 16 进制表示的话，使用两个字符，
+			// 所以表示成 16 进制需要 32 个字符
+			int k = 0;                                // 表示转换结果中对应的字符位置
+			for (int i = 0; i < 16; i++) {    // 从第一个字节开始，对 MD5 的每一个字节
+				// 转换成 16 进制字符的转换
+				byte byte0 = tmp[i];  // 取第 i 个字节
+				str[k++] = hexDigits[byte0 >>> 4 & 0xf];  // 取字节中高 4 位的数字转换,
+				// >>> 为逻辑右移，将符号位一起右移
+				str[k++] = hexDigits[byte0 & 0xf];   // 取字节中低 4 位的数字转换
+			}
+			s = new String(str);  // 换后的结果转换为字符串
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return s;
+	}
+
+}