Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/SystemConfig.java

@@ -61,6 +61,35 @@ public class SystemConfig {
 	// 存放退款证书目录
 	public static String APICLIENT_CERT = SystemProperty.getConfig("APICLIENT_CERT");
 
+	/**
+	 * 支付宝支付相关配置
+	 */
+	public static final String ALIPAY_APPID = SystemProperty.getConfig("ALIPAY_APPID");
+	public static final String ALIPAY_PID = SystemProperty.getConfig("ALIPAY_PID");
+	public static final String ALIPAY_PUBLIC_KEY = SystemProperty.getConfig("ALIPAY_PUBLIC_KEY");
+	public static final String ALIPAY_ACOUNT = SystemProperty.getConfig("ALIPAY_ACOUNT");
+	public static final String ALIPAY_PRIVATE_KEY = SystemProperty.getConfig("ALIPAY_PRIVATE_KEY");
+
+	/**
+	 * 交易创建，等待买家付款
+	 */
+	public  static final String ALIPAY_WAIT_BUYER_PAY = "WAIT_BUYER_PAY";
+	/**
+	 * 未付款交易超时关闭，或支付完成后全额退款
+	 */
+	public  static final String ALIPAY_TRADE_CLOSED = "TRADE_CLOSED";
+	/**
+	 * 交易支付成功
+	 */
+	public  static final String ALIPAY_TRADE_SUCCESS = "TRADE_SUCCESS";
+	/**
+	 * 交易结束，不可退款
+	 */
+	public  static  final String ALIPAY_TRADE_FINISHED = "TRADE_FINISHED";
+
+	public static final String ALIPAY_PAY_BASE_URL = "https://openapi.alipay.com";
 
+	public static final String ALIPAY = "alipay";
 
+	public static final String WXPAY = "wxpay";
 }

ace-common/src/main/resources/properties/systemconfig.properties

@@ -35,3 +35,10 @@ APP_TRADE_TYPE=APP
 weixinHost=xxtest.upyuns.com
 #证书存放目录
 APICLIENT_CERT=D:\\cert\\1514583081_20181017_cert.p12
+
+#支付宝配置
+ALIPAY_APPID=2019070965781964
+ALIPAY_PID=2088531634846583
+ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj/EMaAD2iJP3I5M0g6pssDDe3RxF5I3ECM/Kz/btM0RiW2g5oRrHSjtGuos9l1QhQAY0SrVqa2eZdPKUB3ZqJdimQiXr3dbiMvG9UCs8vVUcrtCHCBjDllKQLiYzboxE6JLXyfII5tIXbFKiGyiEyXQnffUhQ9uGyT2EGWGecz6PLIjDdbwpxuzF2gIUzV3bPxb+0axejBxJ/3zKnWrsbyq2nvs8XrzrR2CEggNqgqsKzaacCL1yZjXzQRseSnCMtgSxR5W5afbdY0zqbUlLHUrUZ8ycCRC0ECuI9HyTbuqtdWHEZH7vIH44wEQWZPDRhMfMZvzmPUgpTWZLv5BtaQIDAQAB
+ALIPAY_ACOUNT=xxfc810@163.com
+ALIPAY_PRIVATE_KEY=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3bANag6my6pjHWqwnSCffRonvOXE6uQgNNb+V23PV55zfcuC+jIgl9BRrIf4tax5f2itfDmlOdAX6mK8WJ620SHg777Q2KlgNTa25ta3xiEfgkb01SX9VyiaLPpP2TEo5LhhRcT+cUomIufQbVbm/jS8mRQ0qBoofbMfr7n9fBSiVDx/QX07qcJTc/MGCy79H5gUiy2fTOEMhTuNtPkoU3az7jXMQ5U/33ILFAJzPCMNJvQnCYxs/y5loxxHdVqV8FnuCWGEWNViuuBtFRVRNXkrs/x99nF0V5/FHnOZzdM3SWrKCpA/52G5QQrbhZXUhMyCs9stXvH+iVUC1JJ9DAgMBAAECggEAOGRf/5MdOGHCCQCKjyUzBQVV4RPDCS/cFtughH1M9sXXyCc0i8D/FtQc9vcjg2k8lHGqBfaTT8iCEhKhOemHETd6p8rBmCmamrR4JfGCghDJMHT+PATVvlWBViwuJ3o7E6tlVJzB1tjVahDpyQGpMwhAJ77xFiueiZzTNmlEBb02ByCG95vkBV7NQT8yO9/1i3eq/tMoY7FfJP5O4LQ41RmqU9TVaAnTfuE6gs5hJboNGbmSMs2w2M0tldibmWcsQsFFPLwbUz042czSVb9J7lsGJjCtsaBeUiJ15y66W9D3587JJar9p+EyA2LNbolgrrNi2AA9KU5wEW2w8XyoOQKBgQDZamXDQZK3N5E46Hp/79o0Q99jqj9sL/HCYB4+Z8dG/Mgs43HHpgd+gHVeSOgxXS7RxsLyjCsM97ysWk7sbafvqtsnYmPU2MzumykVVpgWO6dpBcwmf2Ygk2i2W77oEqIi2IUmzkvDhw9C8A8/oh+IuoyRouPGRHpykAF+uXKVhwKBgQDX+TfQDDPniSnA9kTlW5I44glRgogA4xJtAYLtEr2fH9Pys+lkOyRqQH5wbJVj27jzJ0lffNyyMxgbZ8KRiH+3qRa8wNazwwXlXmj4DQWZedkULOpgMdU4EbbkTQRU3onEpMAZhAmVvAV1KTozs4RKi+1fFZ9V6ZOtmvapNJuXZQKBgQC7Xb0rQ3SMHwAxGfCQFwVma2O2AX883iisCaemwkrze1+Lh8uDcisdMtlzEsO/3v09XdydqHxlZY6cvgssJ+hFXGoXi+xa/yfFLcR/FixlZK2Gja99MeeyhTcFiRWB7KT8ALrnUXvrmpZlanrJrQ8eBx6jV8ySDmu0FTSkoG8GOwKBgE5toxX7CHJBPhdjlvtPOJdNhiLCaw8fZpaNIPVkg9WgIkCVkuCiFYQ8LW44EDv2E4DBOITje+V+Zne1Q1PEJNUWIzqiMJWQ8bgsg6PoXqswM2N/OBF8pzg4PplDWppTQeZWCah6aVylrbmxIgCaZSUJEUchO/5f1xAJIR+rCgF9AoGBAKJVVbrKPWshQ4cTL6VzanowjpWCRUDR22Oz3nKIdRl1FX+DTXYE4Dwl38iiNHOJptS7VjU553BUZl7HxCmSBWUmtnV78NNnRKrFVUhQhIRYBjMn1W6MD0jlBkky6yXmXkPtlqU6vU19RzGrvv6fDdBf6v4AkD8kWXiH5j4XEiQS

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberDTO.java

@@ -53,6 +53,10 @@ public class UserMemberDTO  {
 	@ApiModelProperty(value = "折扣")
 	private Integer discount;
 
+	//购买次数
+	@ApiModelProperty(value = "购买次数")
+	private Integer buyCount;
+
 
 	
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -72,9 +72,13 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
         if(freeDays==null||freeDays==0){
             freeDays=totalNumber;
         }
+        Integer buyCount=1;
+        if(userMemberDTO.getBuyCount()!=null){
+            buyCount=userMemberDTO.getBuyCount();
+        }
         if(userMemberVo==null){
             baseUserMember.setRentFreeDays(freeDays);
-            baseUserMember.setBuyCount(1);
+            baseUserMember.setBuyCount(buyCount);
             insertSelective(baseUserMember);
         }else {
             Integer discount=userMemberVo.getDiscount()==null?0:userMemberVo.getDiscount();
@@ -90,7 +94,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
             baseUserMember.setId(userMemberVo.getId());
             totalNumber+=userMemberVo.getTotalNumber()==null?0:userMemberVo.getTotalNumber();
             freeDays+=userMemberVo.getRentFreeDays()==null?0:userMemberVo.getRentFreeDays();
-            baseUserMember.setBuyCount(userMemberVo.getBuyCount()+1);
+            baseUserMember.setBuyCount(userMemberVo.getBuyCount()+buyCount);
             baseUserMember.setTotalNumber(totalNumber);
             baseUserMember.setRentFreeDays(freeDays);
             getMyBiz().updateSelectiveById(baseUserMember);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -129,7 +129,7 @@ public class AppUserController extends CommonBaseController {
             }
         }
         AppUserPosition userPosition=positionBiz.selectById(positionId);
-        if (userPosition!=null){
+        if (userPosition!=null&&userPosition.getLevel()>0){
             userDTO.setPositionName(userPosition.getName());
         }
         userDTO.setId(id);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

@@ -90,7 +90,7 @@ public class PublicController {
             }
         }
         AppUserPosition userPosition=positionBiz.selectById(positionId);
-        if (userPosition!=null){
+        if (userPosition!=null&&userPosition.getLevel()>0){
             userDTO.setPositionName(userPosition.getName());
         }
         userDTO.setId(id);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -869,6 +869,7 @@ public class AppPermissionService {
             userMemberDTO.setMemberLevel(userMemberExportDTO.getMemberLevel());
             userMemberDTO.setTotalNumber(userMemberExportDTO.getTotalNumber());
             userMemberDTO.setDiscount(userMemberExportDTO.getDiscount());
+            userMemberDTO.setBuyCount(0);
             userMemberDTO.setIsBind(1);
             baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
         }

ace-modules/ace-generator/src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://10.5.52.3:3306/xxfc_activity?useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://10.5.52.3:3306/xxfc_app?useUnicode=true&characterEncoding=UTF-8
         username: root
         password: sslcloud123*()
     jackson:

ace-modules/ace-generator/src/main/resources/generator.properties

 #\u4EE3\u7801\u751F\u6210\u5668\uFF0C\u914D\u7F6E\u4FE1\u606F
 
 #\u5305\u540D
-package=com.xxfc.platform.activity
+package=com.xxfc.platform.app
 #\u4F5C\u8005
-author=libin
+author=zjw
 #Email
 email=18178966185@163.com
 #\u8868\u524D\u9519\u8BEF\u7684Unicode\u5B57\u7B26\u4E32!

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/BuyVehicleForm.java

+package com.xxfc.platform.app.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 购房车提交表单
+ * 
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-09 19:39:47
+ */
+@Data
+@Table(name = "buy_vehicle_form")
+public class BuyVehicleForm implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  车型id
+     */
+    @Column(name = "model_id")
+	@ApiModelProperty(value = "车型id")
+    private Integer modelId;
+	
+	    /**
+     *  联系人名称
+     */
+    @Column(name = "contact_name")
+	@ApiModelProperty(value = "联系人名称")
+    private String contactName;
+	
+	    /**
+     *  联系人电话
+     */
+    @Column(name = "contact_phone")
+	@ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+	
+	    /**
+     *  预约时间
+     */
+    @Column(name = "book_time")
+	@ApiModelProperty(value = "预约时间")
+    private Long bookTime;
+	
+	    /**
+     *  公司id
+     */
+    @Column(name = "company_id")
+	@ApiModelProperty(value = "公司id")
+    private Integer companyId;
+	
+	    /**
+     *  备注
+     */
+    @Column(name = "remark")
+	@ApiModelProperty(value = "备注")
+    private String remark;
+	
+
+}

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BuyVehicleFormBiz.java

+package com.xxfc.platform.app.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.app.entity.BuyVehicleForm;
+import com.xxfc.platform.app.mapper.BuyVehicleFormMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 购房车提交表单
+ *
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-09 19:39:47
+ */
+@Service
+public class BuyVehicleFormBiz extends BaseBiz<BuyVehicleFormMapper,BuyVehicleForm> {
+}
\ No newline at end of file

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/BuyVehicleFormMapper.java

+package com.xxfc.platform.app.mapper;
+
+import com.xxfc.platform.app.entity.BuyVehicleForm;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 购房车提交表单
+ * 
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-09 19:39:47
+ */
+public interface BuyVehicleFormMapper extends Mapper<BuyVehicleForm> {
+	
+}

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/BuyVehicleFormController.java

+package com.xxfc.platform.app.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.app.biz.BuyVehicleFormBiz;
+import com.xxfc.platform.app.entity.BuyVehicleForm;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("buyVehicleForm")
+
+public class BuyVehicleFormController extends BaseController<BuyVehicleFormBiz,BuyVehicleForm> {
+
+}
\ No newline at end of file

xx-app/xx-app-server/src/main/resources/mapper/BuyVehicleFormMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.app.mapper.BuyVehicleFormMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.app.entity.BuyVehicleForm" id="buyVehicleFormMap">
+        <result property="id" column="id"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="name" column="name"/>
+        <result property="modelId" column="model_id"/>
+        <result property="contactName" column="contact_name"/>
+        <result property="contactPhone" column="contact_phone"/>
+        <result property="bookTime" column="book_time"/>
+        <result property="companyId" column="company_id"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderAboutParamDTO.java

@@ -15,4 +15,13 @@ public class OrderAboutParamDTO {
 
     @ApiModelProperty(value = "旅游订单自动取消时间(毫秒)")
     private Long actTour;
+
+    @ApiModelProperty(value = "会员订单自动取消时间(毫秒)")
+    private Long actMember;
+
+    @ApiModelProperty(value = "平台司机单价")
+    private BigDecimal driverPrice;
+
+    @ApiModelProperty(value = "免赔费用")
+    private BigDecimal damageSafe;
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RabbitConsumer.java

@@ -46,7 +46,7 @@ public class RabbitConsumer {
             baseOrderBiz.cancel(baseOrder);
         }catch (BaseException e) {
             if(ResultCode.DB_OPERATION_FAIL_CODE == e.getStatus()) {
-                log.info("取消操作被取消");
+                log.info("取消操作被取消;订单id："+ baseOrder.getId());
             }
         }catch (Exception e) {
             log.error("============消费失败,尝试消息补发再次消费!==============");

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -113,6 +113,9 @@ public class BaseOrderController extends CommonBaseController {
             setInsurePrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.INSURE_PRICE).getDetail()));
             setActRent(new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_RENT).getDetail()));
             setActTour(new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_TOUR).getDetail()));
+            setActMember(new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_MEMBER).getDetail()));
+            setDamageSafe(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DAMAGE_SAFE).getDetail()));
+            setDriverPrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DRIVER_PRICE).getDetail()));
         }});
     }
 
@@ -236,6 +239,7 @@ public class BaseOrderController extends CommonBaseController {
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> get(@PathVariable String no) {
+        log.info("no:"+ no + ",时间戳："+ System.currentTimeMillis());
         //查询列表数据
         if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
@@ -246,6 +250,7 @@ public class BaseOrderController extends CommonBaseController {
         if (page.getData().isEmpty()) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
+        log.info("no:"+ no + ",时间戳："+ System.currentTimeMillis());
         return new ObjectRestResponse<>().data(page.getData().get(0));
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderMemberService.java

@@ -15,6 +15,8 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.pojo.order.MemberBO;
 import com.xxfc.platform.order.pojo.price.OrderPriceVO;
 import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.log4j.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,8 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+
 @Service
 @Log4j
 public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz, MemberBO> {
@@ -36,10 +40,14 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
     @Autowired
     VehicleFeign vehicleFeign;
 
+    @Autowired
+    ThirdFeign thirdFeign;
+
 
     private static Integer IS_CHILD = 1;
     private static Integer LEVEL_DEFAULT = 0;
     private static Integer NUMBER_ZERO = 0;
+    private static Long autoCancelTime;
 
     @Autowired
     OrderCostDetailBiz orderCostDetailBiz;
@@ -68,6 +76,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
     @Override
     public void initDetail(MemberBO bo) {
         super.initDetail(bo);
+        initDictionary();
         BaseUserMemberLevel buml = userFeign.level(bo.getMemberLevel());
         if(!bo.getMemberLevelId().equals(buml.getId())) {
             throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, new HashSet<String>(){{
@@ -79,6 +88,11 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         bo.setRebate(buml.getDiscount());
     }
 
+    public void initDictionary() {
+        dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        this.autoCancelTime = Long.valueOf(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_MEMBER).getDetail());
+    }
+
     @Override
     public void handleDetail(MemberBO bo) {
         //设置订单状态为3
@@ -91,7 +105,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         super.handleDetail(bo);
 
         //发送定时取消订单(30分钟)
-        rabbitProduct.sendDelayMessage(bo.getOrder(), 1000L * 60 * 30);
+        rabbitProduct.sendDelayMessage(bo.getOrder(), autoCancelTime);
     }
 
     @Override

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -166,7 +166,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         VehicleModel vehicleModel = vehicleFeign.get(detail.getModelId()).getData();
 
         //如果用户存在，并且为会员，并且车辆有优惠价
-        if(null != dto && !NONE.getCode().equals(dto.getMemberLevel()) && !DISCOUNT_STATUS_NONE.equals(vehicleModel.getRentDiscountStatus())) {
+        if(null != dto && SYS_TRUE.equals(dto.getIsMember()) && !NONE.getCode().equals(dto.getMemberLevel()) && !DISCOUNT_STATUS_NONE.equals(vehicleModel.getRentDiscountStatus())) {
             String[] prices = StrUtil.isBlank(vehicleModel.getRentDiscountPrice())
                     ?new String[]{vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString()}
                     :vehicleModel.getRentDiscountPrice().split(",");

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -197,7 +197,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
             //总价格
         orderAmount = orderAmount.add(goodsAmount).add(insureAmount);
             //真实价格
-        realAmount = realAmount.add(tourSpePriceVo.getRealPrice()).add(tourSpePriceVo.getRealChildPrice());
+        realAmount = realAmount.add(tourSpePriceVo.getRealPrice()).add(tourSpePriceVo.getRealChildPrice()).add(insureAmount);
 
             //生成订单明细
         TourPriceVO tpv = BeanUtil.toBean(tourSpePriceVo, TourPriceVO.class);

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java

@@ -35,6 +35,7 @@ public class DictionaryKey {
      */
     public static final String ACT_RENT = "ACT_RENT";
     public static final String ACT_TOUR = "ACT_TOUR";
+    public static final String ACT_MEMBER = "ACT_MEMBER";
 
     /**
      * 支付价格减低

xx-universal/xx-universal-server/pom.xml

@@ -78,6 +78,11 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>3.7.26.ALL</version>
+        </dependency>
         <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/OrderPayController.java

@@ -35,6 +35,7 @@ public class OrderPayController extends BaseController<OrderPayBiz,OrderPay> {
         return baseBiz.preparepay(orderPayVo);
     }
 
+
     /**
      * 支付回调
      *
@@ -80,4 +81,18 @@ public class OrderPayController extends BaseController<OrderPayBiz,OrderPay> {
             out.print("<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[]]></return_msg></xml>");
     }
 
+
+    @PostMapping(value = "/app/notify/alipay")
+    @IgnoreUserToken
+    public String alipayNotify(){
+        return baseBiz.alipayNotify();
+    }
+
+    @PostMapping(value = "/app/generate_payment")
+    public Object generatePayment(@RequestParam("orderCode") String orderCode, @RequestParam("description") String description,
+                                  @RequestParam("payType") String payType, @RequestParam("amount") Integer amount) {
+        Object resp = baseBiz.generatePayment(orderCode, description, payType, amount);
+        return resp;
+    }
+
 }
\ No newline at end of file