查询展览纪念馆

src/main/java/com/atlgroupasia/servicecenter/controller/ApiOshServicesOrderController.java

@@ -298,7 +298,7 @@ public class ApiOshServicesOrderController {
         Map<String, Object> result = Maps.newHashMap();
         result.put("orderId", returnVo.getId());
         result.put("code", returnVo.getCode());
-        result.put("createDate", new Date().getTime());
+        result.put("createDate",System.currentTimeMillis());
         result.put("payPrice", returnVo.getTotalPrice());
         return JsonResult.success("新增请求成功", result);
     }
@@ -338,6 +338,32 @@ public class ApiOshServicesOrderController {
     }
 
     /**
+     * 支付2 上面支付app下调用参数未传递过来，为了不影响app重新复制一份解决
+     *
+     * @throws IOException
+     * @author heshenmi
+     * 2017年9月26日 下午6:26:53
+     */
+    @ApiOperation(" 支付2 上面支付app下调用参数未传递过来，为了不影响app重新复制一份解决")
+    @RequestMapping(value = "/wxPay2", method = RequestMethod.POST)
+    public JsonResult pay2(@ApiParam(value = "传入对象") @RequestBody OshServicesOrderVo vo, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        OshServicesOrderVo result = oshServicesOrderSerice.getViewByCode(vo);
+        String totalPrice = result.getTotalPrice() + "";
+        if ("0.0".equals(totalPrice)) {
+            return JsonResult.failed("订单价格异常,支付失败");
+        }
+        if ("0".equals(vo.getPayChooseType())) {
+            return JsonResult.success("支付请求成功", oshServicesOrderSerice.doUnifiedOrder(vo.getCode(), totalPrice));
+        } else if ("1".equals(vo.getPayChooseType())) {
+            return JsonResult.success("支付请求成功", oshServicesOrderSerice.doUnifiedOrderForH5(vo.getCode(), vo.getPayType(), totalPrice));
+        } else if ("2".equals(vo.getPayChooseType())) {
+            return JsonResult.success("支付请求成功", oshServicesOrderSerice.doUnifiedOrderForJSAPI(vo.getCode(), totalPrice, vo.getOpenId()));
+        } else {
+            return JsonResult.success("支付请求成功", oshServicesOrderSerice.doUnifiedOrderForAppletJSAPI(vo.getCode(), totalPrice, vo.getOpenId()));
+        }
+    }
+
+    /**
      * 支付回调
      *
      * @throws IOException

src/main/java/com/atlgroupasia/servicecenter/service/DonateOrderService.java

@@ -2,6 +2,7 @@ package com.atlgroupasia.servicecenter.service;
 
 import com.atlgroupasia.servicecenter.dto.DrpDonateOrderDTO;
 import com.atlgroupasia.servicecenter.dto.MisBlessDTO;
+import com.atlgroupasia.servicecenter.dto.OshUserBlessUsingDTO;
 import com.atlgroupasia.servicecenter.entity.DonateOrder;
 import com.atlgroupasia.servicecenter.mapper.BlessMapper;
 import com.atlgroupasia.servicecenter.mapper.DonateOrderMapper;
@@ -40,7 +41,7 @@ public class DonateOrderService {
      * @param phone
      * @return
      */
-    public JsonResult selectBlessListDonateOrderRelationPhone(String phone) {
+    public JsonResult<MisBlessDTO> selectBlessListDonateOrderRelationPhone(String phone) {
         //通过手机号查询福位订单
         List<DrpDonateOrderDTO> drpDonateOrderDTOList = this.donateOrderMapper.selectDonateOrderByPhone(phone);
         if (drpDonateOrderDTOList == null || drpDonateOrderDTOList.size() <= 0) {
@@ -74,7 +75,7 @@ public class DonateOrderService {
      * @param blessId
      * @return
      */
-    public JsonResult selectUserBlessUsingListByBlessId(Integer blessId) {
+    public JsonResult<OshUserBlessUsingDTO> selectUserBlessUsingListByBlessId(Integer blessId) {
         return JsonResult.success("查询成功",this.userBlessUsingMapper.selectUserBlessUsingById(blessId));
     }
 

src/main/java/com/atlgroupasia/servicecenter/utils/WXOfficeConfigUtil.java

@@ -21,7 +21,7 @@ public class WXOfficeConfigUtil implements WXPayConfig {
 
     /*微信公众号*/
     public static final String APP_ID = "wxbd6cf7b619de70d9";
-    public static final String APP_SECRET = "79a5044ac7856522eacc9f824013febb";
+    public static final String APP_SECRET = "4bbb492abc6c12756e4bcbb775ae5069";
 
     public WXOfficeConfigUtil() throws Exception {
         String certPath = "/www/wwwroot/userapi.atlxm.com/apiclient_cert.p12";

src/main/java/com/atlgroupasia/servicecenter/vo/OshServicesOrderVo.java

@@ -10,6 +10,7 @@ import java.util.Date;
 @Data
 public class OshServicesOrderVo {
 
+	@ApiModelProperty(value = "手机号码")
 	private String phone;
 
 	private Long id;
@@ -19,7 +20,7 @@ public class OshServicesOrderVo {
 	private Long blessId;
 
 	private Long blessUsingId;
-
+	@ApiModelProperty(value = "订单编码")
 	private String code;
 
 	private Long userId;
@@ -58,7 +59,7 @@ public class OshServicesOrderVo {
 	private String remark;
 
 	private String payType;
-
+	@ApiModelProperty(value = "微信的code")
 	private String wxCode;
 
 	private String nickName;
@@ -66,7 +67,10 @@ public class OshServicesOrderVo {
 	private String pic;
 	@ApiModelProperty(value = "非app时的支付，为必传",required = false)
 	private String openId;
-
+	@ApiModelProperty(value = "支付类型(0:APP 1:H5 2:JSAPI 3:小程序)")
 	private String payChooseType;
-
+    @ApiModelProperty(value = "关联app时光纪id",required = false)
+    private Long relationTimeId;
+    @ApiModelProperty(value = "关联app的用户id",required = false)
+    private Long relationUserId;
 }

src/main/resources/application.yml

@@ -10,13 +10,13 @@ spring:
   #���ݿ�����
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    #url: jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-    #username: test_erp
-    #password: Fzii591com
+    url: jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: test_erp
+    password: Fzii591com
 
-    url: jdbc:mysql://47.98.216.76:3306/atl-service-center?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-    username: root
-    password: 6just@2019
+    #url: jdbc:mysql://47.98.216.76:3306/atl-service-center?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    #username: root
+    #password: 6just@2019
 
     type: com.alibaba.druid.pool.DruidDataSource
 

src/main/resources/mapper/DonateOrderMapper.xml

@@ -50,8 +50,11 @@
                 b.name donorName,b.phone donorPhone
         from drp_donate_order a
         left join drp_donor b ON a.donor_id = b.id
-        where state in (3,5)
+        where a.state in (3,5)
         and b.phone =#{phone}
+        and b.authentication = 1
+        and b.is_del = 0
     </select>
 
+
 </mapper>

src/main/resources/mapper/OshServicesOrderMapper.xml

@@ -163,8 +163,22 @@
    </update>
 
     <insert id="insert"  keyProperty="id" keyColumn="id" useGeneratedKeys="true">
-    INSERT INTO osh_services_order(bless_using_id, code , phone, nick_name, pic, `sum`, age_limit, total_price, status, confirm_time,confirm_end_time,  create_time, remark, is_del)
-    VALUES(#{blessUsingId}, #{code},  #{phone}, #{nickName}, #{pic}, #{sum}, #{ageLimit}, #{totalPrice}, 1 , #{confirmTime}, #{confirmEndTime},  NOW(), #{remark}, 0)
+    INSERT INTO osh_services_order(bless_using_id, code , phone, nick_name, pic, `sum`, age_limit, total_price, status, confirm_time,confirm_end_time,  create_time, remark, is_del
+      <if test="relationTimeId != null">
+          ,relation_time_id
+      </if>
+      <if test="relationUserId != null">
+        ,relation_user_id
+      </if>
+    )
+    VALUES(#{blessUsingId}, #{code},  #{phone}, #{nickName}, #{pic}, #{sum}, #{ageLimit}, #{totalPrice}, 1 , #{confirmTime}, #{confirmEndTime},  NOW(), #{remark}, 0
+        <if test="relationTimeId != null">
+            ,#{relationTimeId}
+        </if>
+        <if test="relationUserId != null">
+            ,#{relationUserId}
+        </if>
+    )
     </insert>
 
     <select id="findVideoListUnWatch" resultType="java.util.Map">