合并

CODE/smart-community/app-api/pom.xml

@@ -114,6 +114,14 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/com.alipay.sdk/alipay-sdk-java -->
+		<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-sdk-java</artifactId>
+			<version>3.3.49.ALL</version>
+		</dependency>
+
+
 		<!-- log4j -->
 
 		<!--<dependency>-->

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AliPayController.java

@@ -0,0 +1,100 @@
+package com.community.huiju.controller;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.service.AliPayServiceI;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
+
+/**
+ * @author FXF
+ * @date 2019-03-12
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "支付宝支付 API", description = "支付宝支付 API")
+public class AliPayController {
+	
+	private Logger log = LoggerFactory.getLogger(AliPayController.class);
+	
+	@Autowired
+	private AliPayServiceI aliPayService;
+	
+	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
+	private String ALIPAY_PUBLIC_KEY;
+	
+	@ApiOperation(value = "统一下单", notes = "统一下单")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
+	@RequestMapping(value = "/aliPayOrder/{billInvoiceId}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		//UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		String resp = "";
+		try {
+			resp = aliPayService.AliPayOrder(1,null);
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "支付宝手机订单支付完成后回调", notes = "支付宝手机订单支付完成后回调")
+	@RequestMapping(value = "/aliPayNotify",method = RequestMethod.POST)
+	public void wxNotify(HttpServletRequest request, HttpServletResponse response){
+		Map<String,String> params = new HashMap<String,String>();
+		Map requestParams = request.getParameterMap();
+		for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
+			String name = (String) iter.next();
+			String[] values = (String[]) requestParams.get(name);
+			String valueStr = "";
+			for (int i = 0; i < values.length; i++) {
+				valueStr = (i == values.length - 1) ? valueStr + values[i]
+						: valueStr + values[i] + ",";
+			}
+			//乱码解决，这段代码在出现乱码时使用。
+			//valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
+			params.put(name, valueStr);
+		}
+		//切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
+		try {
+			System.out.println(params);
+			boolean flag = AlipaySignature.rsaCheckV1(params, ALIPAY_PUBLIC_KEY, CHARSET_UTF8,"RSA2");
+			System.out.println(flag);
+		} catch (AlipayApiException e) {
+			e.printStackTrace();
+		}
+	}
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -266,6 +266,35 @@ public class SocialController extends BaseController {
         return responseBean;
     }
 
+
+    @ApiOperation(value = "查询二手租赁回复", notes = "查询二手租赁回复")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "transactionId", value = "活动帖子id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "order", value = "asc 正序(默认), desc倒序")
+    })
+    @RequestMapping(value = "/getTransactionReply", method = RequestMethod.GET)
+    public ResponseBean findUsedDetailsReply(@RequestParam("transactionId") Integer transactionId,
+                                             @RequestParam(value = "order", defaultValue = "asc") String order,
+                                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                             HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        if (!check(userElement.getCommunityId())) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.findUsedDetailsReply(transactionId, userElement, order, pageNum, pageSize);
+        return responseBean;
+    }
+
+
+
     @ApiOperation(value = "获取所有的二手租赁帖子", notes = "获取所有的二手租赁帖子")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -44,8 +44,6 @@ public class TpTransaction {
 
     private  String roleName;
 
-    // 帖子的回复集合
-    private List<TpTransactionReply> replies;
 
     public String getRoleName() {
         return roleName;
@@ -188,11 +186,4 @@ public class TpTransaction {
         this.createUserName = createUserName;
     }
 
-    public List<TpTransactionReply> getReplies() {
-        return replies;
-    }
-
-    public void setReplies(List<TpTransactionReply> replies) {
-        this.replies = replies;
-    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/AliPayServiceI.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.community.commom.session.UserElement;
+
+import java.util.Map;
+
+public interface AliPayServiceI {
+	/**
+	 * 微信支付统一下单
+	 * @return
+	 * @param billInvoiceId
+	 * @param userElement
+	 */
+	String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception;
+	
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -170,10 +170,21 @@ public interface SocialServiceI {
 	ResponseBean reportTransaction(Integer userId,Integer communityId, String paramets);
 
 	/**
-	 * 二帖子回复
-	 * @param paramets
-	 * @param userElement
+	 * 查询 二手交易帖子的回复
+	 * @param transactionId 帖子id
+	 * @param userElement 用户信息体
+	 * @param order asc 正序  desc 倒序
+	 * @param pageNum
+	 * @param pageSize
 	 * @return
 	 */
+	ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize);
+	/**
+	 * 二帖子回复
+	 *@param paramets
+	 *@param userElement
+	 *@return
+	 */
     ResponseBean addTransactionReply(String paramets, UserElement userElement);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/AliPayServiceImpl.java

@@ -0,0 +1,119 @@
+package com.community.huiju.service.impl;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.AlipayTradeAppPayModel;
+import com.alipay.api.request.AlipayTradeAppPayRequest;
+import com.alipay.api.response.AlipayTradeAppPayResponse;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.wxpay.HfWxConfig;
+import com.community.huiju.common.wxpay.WXPay;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.dao.TaSysRoleMapper;
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.dao.TpBillMapper;
+import com.community.huiju.dao.TpBillStatementMapper;
+import com.community.huiju.model.TaSysRole;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpBillInvoice;
+import com.community.huiju.service.AliPayServiceI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
+
+/**
+ * @author FXF
+ * @date 2018-10-25
+ */
+@Service("aliPayService")
+@Transactional(rollbackFor = Exception.class)
+public class AliPayServiceImpl implements AliPayServiceI {
+	private Logger log = LoggerFactory.getLogger(AliPayServiceImpl.class);
+	
+	@Autowired
+	private TpBillInvoiceMapper tpBillInvoiceMapper;
+	
+	@Autowired
+	private TpBillStatementMapper tpBillStatementMapper;
+
+	@Autowired
+	private TpBillMapper tpBillMapper;
+
+	@Autowired
+	private TaUserMapper taUserMapper;
+
+	@Autowired
+	private TaSysRoleMapper taSysRoleMapper;
+	
+	@Value("${alipay.APP_PRIVATE_KEY}")
+	private String APP_PRIVATE_KEY;
+	
+	@Value("${alipay.APP_ID}")
+	private String ALI_APP_ID;
+	
+	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
+	private String ALIPAY_PUBLIC_KEY;
+	
+	/**
+	 * 支付宝统一下单
+	 *
+	 * @return
+	 * @param billInvoiceId
+	 * @param userElement
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception {
+		//Integer userId = userElement.getId();
+		//
+		//// 如果是家属/租客, 应该用业主的用户id
+		//TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+		//TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
+		//if (null != taSysRole && taSysRole.getId().intValue() != 1) {
+		//	TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
+		//	userId = ownerUser.getId();
+		//}
+		//
+		////获取支付金额
+		//TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
+		//if (null == tpBillInvoice){
+		//	throw new Exception("订单不存在");
+		//}else if (!tpBillInvoice.getBillStatus().equals("3")){
+		//	throw new Exception("不是正在支付的订单");
+		//}
+		
+		//下单
+		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ALI_APP_ID, APP_PRIVATE_KEY, "json", CHARSET_UTF8, ALIPAY_PUBLIC_KEY, "RSA2");
+		//实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+		AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+		//SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+		AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+		model.setBody("我是测试数据");
+		model.setSubject("App支付测试Java");
+		//model.setOutTradeNo(tpBillInvoice.getOutTradeNo());
+		model.setOutTradeNo("1");
+		model.setTimeoutExpress("30m");
+		model.setTotalAmount("0.01");
+		model.setProductCode("QUICK_MSECURITY_PAY");
+		request.setBizModel(model);
+		request.setNotifyUrl("http://106.14.20.193:8086/app-api/aliPayNotify");
+		try {
+			//这里和普通的接口调用不同，使用的是sdkExecute
+			AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+			//就是orderString 可以直接给客户端请求，无需再做处理。
+			System.out.println(response.getBody());
+			return response.getBody();
+		} catch (AlipayApiException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -732,10 +732,6 @@ public class SocialServiceImpl implements SocialServiceI {
         List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
         tpTransaction.setImgList(imgList);
 
-        // 查询回复信息
-        List<TpTransactionReply> transactionReplies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(communityId, tpTransaction.getId());
-        tpTransaction.setReplies(transactionReplies);
-
         return tpTransaction;
 
     }
@@ -772,4 +768,15 @@ public class SocialServiceImpl implements SocialServiceI {
 
         return responseBean;
     }
+
+    @Override
+    public ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        PageHelper.startPage(pageNum, pageSize, "create_date " + order);
+        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId);
+
+        responseBean.addSuccess(replies);
+        return responseBean;
+    }
 }

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -18,4 +18,8 @@ pagehelper:
 # 打印sql
 logging:
   level:
-    com.community.huiju.dao: debug
+    com.community.huiju.dao: debug
+alipay:
+  APP_ID: 2019021463230548
+  APP_PRIVATE_KEY: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkrvqeBeJNNeKByYSBq8U+V0STFBh70IGaHi2oPa3TiF6u2WAJ7YlH2h1S4Zj2Ezojckfl0m8y/nqpPay6gSMBOpR38A+94gNiH7BVfyecuuQ9z+2BJdOxN5RkEBBkUqeW4oUbrgY4mRLPRrUKvAu/4Brd0eojkkEW0hJUxqgKj+C4H5tR+6DRowHcO23Q/98+4qlSRjhygLVK4m+u8+zb26RxF4v0ogooF+EAZQLOqz3N4uaZs2ajgnecG0drtei7mxbpyqHMr0idP4U4Lx63yXViRNWpHQ7u7byOBQNV9MFHWPHKt+aNOqZ61LCXpJt777usQPzQJggZj6TpRtT3AgMBAAECggEAHM36Sf+PeJ/PMZJU2fV4d5H+DZe7PJTYxmM26zF2oQQ+Q2kEElh45Zdx/5g0D/6G8cJAbyNijdHTFJ0UBD8oJ0Peyie0KStKGjSevCWUgSZzW5ht22QJZfrpuqLQqyuF4q9WRuQmdGnZz2V3rxv7FiGVsWzQ/k3LkrlFuYxRwh7lpJvHC/ed5o1NI4t+w0lBNp3qonJJ8QYsAGWoJR8iP/XrupErrTivRHkyzEos1DsDdPb5TPV21D+YO7FlqTb6/nqqJH6IOjxMI/PlWGRS3l12TeHqv8W2PWIrZvcTGBqMOiHKGt9Y2ZAIelKBGv+lr2G4yaSnWSXec+6V4x3sWQKBgQDv9r26pbBoEtwGd55zAXTr+0A4jwfgUtVm0Z2b/WG857k+iR5hdLX6PHinbgD7sFpRAhoWGNLPa88ZjPDD0JyFwVMEN176k6zEyrBSbbyoCYJeYbWikebdKdiKNE/WFqZGS3Olm3pdHxwD2Q92H61XHLveWRHmYGAlTi66txPh6wKBgQCvsFr8CUt4Y8RU0RGvBLG7JRpRIaVKF34r6YsHZhpAluQ1WAqJEezmYMTfLi81UNYUZHaw7SyG1O+WiEMpWH0Y+qV/z6OUn+37lll7RsIpy9EGLY4L51emCClBmcUIGp80sA2rfF4U8dc23lwIHpLSUWoKOlcQO4gqzLICTLwKJQKBgGjlCvrUAtD7rYKGN5U+RcYCBoiyvVap3u8bIjJWCKty/97+QXGIeyPv2y4VQAjFhjVzHcQbBcv17InWukheoI03fPqS2cnfU96SW5EstxMdVQe83pE6BhkXebiwNVX4gKapxNvXox2hw7VK5R9VqYgy30zK0rBJ4L1t969W6DIRAoGALGSzmNwAZftPsN7jSQY2osNNUxLdYUtuZkotB0GVgJygLZqBjwEoi04IcRyKcT5r2dtI4owLpEZKBA+KaPgjJByxlQoym2uOBvSGx8+pYEZQGu+H5Rof26RUSG9Cijmv4PBbg+l5HHG/n+2v851GHD7WPJ9hQIjKb4YptMsO+MECgYEAyD8rx2Vk2smh5chVkkiw1QMSoV91B+dJ8+B/G0Moxy9Hzp/s4O8mG4B2ByCkcRgkbMTJmNndk5MTd0gjX4C4C3FKf2vbdqFuCKAPzJ0rTs/rLcjz2/g8I7BMvVd/sEh77iewsVLvSLhF2ZRxD9Mc2qfffU4hq8F4WIyLVgvizFU=
+  ALIPAY_PUBLIC_KEY: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJtkEz+TiJR/KbLDeP0rKQTSrQO7g8sGU0G0RYIN3KF6CiWd+eaT/ioM0BpR1Jx+IuAdpo3DFBqhLA6ABSHXFZPRikcxNlsyz2JgkwzfsRY+DxcPnYYNZFK7pUbku8L/AIxZiFQcbunwz36acazaZpun0zgrQlcBZqBCTCIgkT2fMQbPTm/MrmUKjDTE0VP+1mFyjYUVZWpJEYE5AJ3+x7jAPmuEdSMwKONUtOOTByDrkmXJ60RGE8zCmO/oUmOGxnTQRYfNjvBZ0lbVdP/bAw6qHVFBElzPHjNerbMK/geLuiLs3vkDY9tw7A4GQYMnjKuoetuMUhxZ6nRTH6NCeQIDAQAB

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToBannerServiceImpl.java

@@ -15,7 +15,9 @@ import com.community.huiju.vo.ToBannerVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
+import org.apache.commons.httpclient.HttpState;
 import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpStatus;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -190,7 +192,7 @@ public class ToBannerServiceImpl implements IToBannerService {
 
     @Override
     public ResponseBean getBanner(ToBanner banner,Integer pageNum, Integer pageSize) {
-
+        
         ResponseBean response = new ResponseBean();
 
         Page<ToBanner> page = PageHelper.startPage(pageNum,pageSize);