订单优化更新

src/main/java/com/szwl/controller/TOrderController.java

@@ -893,7 +893,7 @@ public class TOrderController {
             String result1 = null;
             try {
                 result1 = joinpayMchService.uniPay(
-                        orderNo2, amount, productName, productDesc,
+                        orderNo2, amount, productName1, productDesc,
                         commonParameter, returnUrl, notifyUrl, frpCode2,
                         isShowPic, openId, authCode, appid, transactionModel, tradeMerchantNo,
                         buyerId, isAlt, altType, altInfo, altUrl, marketingAmount
@@ -1250,7 +1250,12 @@ public class TOrderController {
         orderDetails.setMachineType(equipment.getMachineType());
 
         String client6 = clientId.substring(clientId.length() - 6);
-        String productName1 = productName + "-" + equipment.getName() + "-" + client6;
+        String productName1 = "";
+        if(equipment.getMachineType() == null || equipment.getMachineType().equals("0")) {
+            productName1 = "棉花糖-" + equipment.getName() + "-" + client6;
+        } else {
+            productName1 = "爆米花-" + equipment.getName() + "-" + client6;
+        }
         String result = null;
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
             // 汇付分账参数
@@ -1721,7 +1726,12 @@ public class TOrderController {
         orderDetails.setMachineType(equipment.getMachineType());
 
         String client6 = clientId.substring(clientId.length() - 6);
-        String productName1 = productName + "-" + equipment.getName() + "-" + client6;
+        String productName1 = "";
+        if(equipment.getMachineType() == null || equipment.getMachineType().equals("0")) {
+            productName1 = "棉花糖-" + equipment.getName() + "-" + client6;
+        } else {
+            productName1 = "爆米花-" + equipment.getName() + "-" + client6;
+        }
         String result = null;
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
             order.setAcctSplitBunch(acctSplitBunch.toString());

src/main/java/com/szwl/service/impl/THuifuMchServiceImpl.java

@@ -119,7 +119,16 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
         String productName = huifuTempOrder.getProductName();
         TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
         String client6 = clientId.substring(clientId.length() - 6);
-        String productName1 = productName + "-" + equipment.getName() + "-" + client6;
+        String productName1 = "";
+        if(huifuTempOrder.getProductNumber() > 1) {
+            if(equipment.getMachineType() == null || equipment.getMachineType().equals("0")) {
+                productName1 = "棉花糖-" + equipment.getName() + "-" + client6;
+            } else {
+                productName1 = "爆米花-" + equipment.getName() + "-" + client6;
+            }
+        } else {
+            productName1 = productName + "-" + equipment.getName() + "-" + client6;
+        }
         request.put("goods_desc", productName1);
 //        request.put("goods_desc", huifuTempOrder.getProductName());
         request.put("notify_url", HuifuConstant.Notify_Url);

src/main/java/com/szwl/service/impl/TJoinpayMchServiceImpl.java

@@ -11,6 +11,7 @@ import com.szwl.model.utils.HttpClientUtils;
 import com.szwl.constant.JoinpayConstant;
 import com.szwl.model.utils.RSAUtil;
 import com.szwl.service.TJoinpayMchService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.message.BasicNameValuePair;
@@ -32,6 +33,7 @@ import java.util.*;
  * @author wuhs
  * @since 2022-04-29
  */
+@Slf4j
 @Service
 public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoinpayMch> implements TJoinpayMchService {
 
@@ -429,10 +431,10 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
         }
         String hmac = createHmacSign(data, JoinpayConstant.key);
         data.add(new BasicNameValuePair("hmac", hmac));
-//        logger.info("请求参数：" + data);
+        log.info("请求参数：" + data);
 
         String result = HttpClientUtils.postKeyValue(url, data);
-//        logger.info("响应参数：" + result);
+        log.info("响应参数：" + result);
 
 
         return result;