需求 #17586

src/main/java/com/egolm/shop/api/OrderController.java

@@ -12,6 +12,7 @@ import java.util.TreeMap;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,7 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.egolm.common.Base64Util;
 import com.egolm.common.DateUtil;
 import com.egolm.common.FileUtil;
 import com.egolm.common.HttpUtil;
@@ -28,11 +31,13 @@ import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
 import com.egolm.common.web.ServletUtil;
 import com.egolm.shop.api.service.OrderService;
+import com.egolm.shop.api.service.impl.OrderServiceImpl;
 import com.egolm.shop.bean.RespObject;
 import com.egolm.shop.common.XException;
 import com.egolm.shop.common.component.IDCLogResource;
 import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.common.utils.XmlUtil;
+import com.jcraft.jsch.Logger;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -43,7 +48,6 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping("order")
 public class OrderController {
-	
 	@Autowired
 	private OrderService orderService;
 	
@@ -104,7 +108,7 @@ public class OrderController {
 		 @ApiImplicitParam(paramType = "query", name = "orderMemo", dataType = "String", required = true, value = "订单备注", defaultValue = ""),   
 		 @ApiImplicitParam(paramType = "query", name = "cargoTypeID", dataType = "String", required = false, value = "货站ID", defaultValue = "需求 #17557"),   
 		 @ApiImplicitParam(paramType = "query", name = "balanceAmount", dataType = "String", required = false, value = "分账余额", defaultValue = "需求 #17203"), 
-		 @ApiImplicitParam(paramType = "query", name = "payDetails", dataType = "String", required = false, value = "付款详情JSON格式 [{\"PayTypeID\" : \"120\",\"PayType\" : \"微信支付\",\"PayAmount\" : 100.00,\"PayPoint\" : 0.00,\"PayCardNO\" : \"800001000184\"},{\"PayTypeID\" : \"81\",\"PayType\" : \"优惠券\",\"PayAmount\" : 100.00,\"PayPoint\" : 0.00,\"PayCardNO\" : \"800001000184\"}]", defaultValue = "需求 #17402"), 
+		 @ApiImplicitParam(paramType = "query", name = "payDetails", dataType = "String", required = false, value = "付款详情JSON格式 [{\"PayTypeID\" : \"120\",\"PayType\" : \"微信支付\",\"PayAmount\" : 100.00,\"PayPoint\" : 0.00,\"PayCardNO\" : \"800001000184\"},{\"PayTypeID\" : \"81\",\"PayType\" : \"优惠券\",\"PayAmount\" : 100.00,\"PayPoint\" : 0.00,\"PayCardNO\" : \"800001000184\"}]", defaultValue = "需求 #17402 需求 #17586 base64"), 
 		 
 
 	  	@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
@@ -127,7 +131,8 @@ public class OrderController {
  		if(StringUtil.isNotUndefinedAndNull(balanceAmount)) {
  		}else {
  			balanceAmount = "0";
- 		}
+ 		} 
+ 		
  		if(!StringUtil.isNotEmpty(shopNO,payTypeID,addrID)) {
 			return Rjx.json().setCode(-1).setMessage(I18NUtils.getMessage(langID, "Msg_Parameter_empty")).toJson();
 		}

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

@@ -29,6 +29,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.egolm.common.Base64Util;
 import com.egolm.common.DateUtil;
 import com.egolm.common.FileUtil;
 import com.egolm.common.GsonUtil;
@@ -1589,6 +1590,15 @@ public class OrderServiceImpl implements OrderService {
 		PlatformTransactionManager transactionManager = new DataSourceTransactionManager(dataSource);
 		TransactionStatus status = transactionManager.getTransaction(def);*/
 		
+		String payDetails = map.get("payDetails")+""; //付款详情
+		try {
+ 			JSONArray.parse(payDetails);
+ 		}catch (Exception e) {
+ 			payDetails = Base64Util.decode(payDetails);
+ 			logger.info("付款详情base64解密后: {} ",payDetails);
+		}  
+		
+		
 		String LangID = "" + map.get("langID");
 		try {
 			String shopNO = "" + map.get("shopNO");
@@ -1599,9 +1609,8 @@ public class OrderServiceImpl implements OrderService {
 			  
 			String balanceAmount = map.containsKey("balanceAmount")?map.get("balanceAmount")+"":"0";  //需求 #17203 
 			
-			String cargoTypeID = map.containsKey("cargoTypeID")?map.get("cargoTypeID")+"":"";// 货站ID
+			String cargoTypeID = map.containsKey("cargoTypeID")?map.get("cargoTypeID")+"":"";// 货站ID 
 			
-			String payDetails = map.get("payDetails")+""; //付款详情
 
 			String sql = "exec up_NewCreatetSalesOrder '" + shopNO + "','', '" + payID + "', '" + terminalTypeID
 					+ "', '" + addrID + "', '" + orderMemo + "', '','', '', '1', '', '', '', '', '', '','0','','' ,'','"+balanceAmount+"','"+cargoTypeID+"' ";

src/main/resources/templates/redmine.html

@@ -27,7 +27,8 @@
 		<el-divider content-position="left">V1.1.7.8.7 2024-11-11</el-divider>
 		<p class="title">1.订货端-订单详情展示【物流电话】、确认订单页-增加【货站】返回-服务  需求 #17557</p>
 		<p class="title">2.card接口调用主库</p>
-		<p class="title">2.card query再调一次过程</p>
+		<p class="title">3.card query再调一次过程</p>
+		<p class="title">4. submitV2 中payDetails改为base64传参，需求 #17586</p>
 		<el-divider content-position="left">V1.1.7.8.6 2024-10-15</el-divider>
 		<p class="title">1.订货端-售后/退款：AgentID参数过滤 需求 #17488</p>
 		<el-divider content-position="left">V1.1.7.8.5 2024-9-25</el-divider>