--升级兼容pc端

This commit is contained in:
xuwenbo
2021-05-11 14:06:16 +08:00
parent 82c08ddcc6
commit 3d5f79411d
12 changed files with 36 additions and 26 deletions

View File

@ -7,7 +7,7 @@
* 一经发现盗用、分享等行为,将追究法律责任,后果自负
*/
package co.yixiang.modules.mp.service;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@ -135,6 +135,7 @@ public class WeixinPayService {
orderRequest.setTradeType("APP");
}else if(AppFromEnum.PC.getValue().equals(from)){
orderRequest.setTradeType("NATIVE");
orderRequest.setProductId( UUID.fastUUID().toString());
} else{
orderRequest.setTradeType("JSAPI");
if(AppFromEnum.ROUNTINE.getValue().equals(from)){