Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -469,7 +469,14 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            throw new Exception("ourTradeNo is null :the ourTradeNo is "+ourTradeNo);
        }
        HashMap<String, String> map = new HashMap<>();
        map.put("appid",wxWechatDO.getAppId());
        if (tradeType.equalsIgnoreCase("APPLETS")){
            map.put("appid",wxWechatDO.getApplets());
            map.put("trade_type", "JSAPI");
        }else {
            map.put("appid",wxWechatDO.getAppId());
            map.put("trade_type", tradeType);
        }
        map.put("mch_id",wxWechatDO.getMchId());
        map.put("body",body);
        map.put("out_trade_no",ourTradeNo);
@@ -477,7 +484,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        map.put("total_fee",totalFee);
        map.put("spbill_create_ip",getServerIp());
        map.put("notify_url",notifyUrl);
        map.put("trade_type", tradeType);
        if (tradeType.equalsIgnoreCase("JSAPI")){
            map.put("openid", openId);
        }

common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxWechatDO.java

@@ -7,7 +7,6 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -36,6 +35,7 @@ public class WxWechatDO extends UuidIdentityEntityWithOperator implements java.i
    private String mchId;//商户id
    private String cerfiticate;//商户证书(预留字段,保存证书路径??) 目前暂未使用到
    private String appKey;//appKey
    private String applets;//小程序id
    @Transient
@@ -218,4 +218,14 @@ public class WxWechatDO extends UuidIdentityEntityWithOperator implements java.i
    public void setAppKey(String appKey) {
        this.appKey = appKey;
    }
    @Column(name = "applets")
    public String getApplets() {
        return applets;
    }
    public void setApplets(String applets) {
        this.applets = applets;
    }
}