Merge branches 'develop' and 'feature/20220112_银行周周惠_wuping' of…

Merge branches 'develop' and 'feature/20220112_银行周周惠_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

@@ -1316,9 +1316,10 @@ public class PayServiceImpl {
         plugInParameter.setSignMchid(signMchid);
         plugInParameter.setStoreId(thirdStoreId);
 
-        String message = "apply_mchid="+applyMchid+"&sign_mchid="+signMchid+"&store_id="+thirdStoreId;
+        String encryptKey = assortmentOpenPlatformPartnerPaymentAuth.getEncryptKey();
+        String message = "apply_mchid="+applyMchid+"&sign_mchid="+signMchid+"&store_id="+thirdStoreId + "&key="+encryptKey;
 
-        String sign = HMacSHA256.encrypt(message,assortmentOpenPlatformPartnerPaymentAuth.getPrivate_key());
+        String sign = HMacSHA256.encrypt(message,encryptKey);
         plugInParameter.setSign(sign);
 
         return plugInParameter;

order-application-service/src/main/java/cn/freemud/utils/HMacSHA256.java

@@ -42,7 +42,6 @@ public class HMacSHA256 {
                 hs.append('0');
             hs.append(stmp);
         }
-        return hs.toString().toLowerCase();
+        return hs.toString().toUpperCase();
     }
-
 }