合并

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

@@ -8,6 +8,7 @@ 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.community.huiju.service.WxPayServiceI;
 import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -49,6 +50,9 @@ public class AliPayController {
 	@Autowired
 	private AliPayServiceI aliPayService;
 	
+	@Autowired
+	private WxPayServiceI wxPayService;
+	
 	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
 	private String ALIPAY_PUBLIC_KEY;
 	
@@ -73,7 +77,8 @@ public class AliPayController {
 	
 	@ApiOperation(value = "支付宝手机订单支付完成后回调", notes = "支付宝手机订单支付完成后回调")
 	@RequestMapping(value = "/aliPayNotify",method = RequestMethod.POST)
-	public void wxNotify(HttpServletRequest request, HttpServletResponse response){
+	public void aliPayNotify(HttpServletRequest request, HttpServletResponse response){
+		System.out.println("alipay result  start =======");
 		Map<String,String> params = new HashMap<String,String>();
 		Map requestParams = request.getParameterMap();
 		for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
@@ -90,11 +95,15 @@ public class AliPayController {
 		}
 		//切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
 		try {
-			System.out.println(params);
 			boolean flag = AlipaySignature.rsaCheckV1(params, ALIPAY_PUBLIC_KEY, CHARSET_UTF8,"RSA2");
-			System.out.println(flag);
+			if (flag){
+				params.put("pay_type","2");
+				wxPayService.wxNotify(params);
+			}
 		} catch (AlipayApiException e) {
 			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
 	}
 }

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

@@ -95,6 +95,7 @@ public class WxPayController {
 			Map<String, String> resultMap = WXPayUtil.xmlToMap(result);
 			if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("result_code"))) {
 				//处理业务逻辑 修改订单状态等
+				resultMap.put("pay_type","0");
 				String state = wxPayService.wxNotify(resultMap);
 				if (state.equals("success")){
 					log.info("微信支付成功。。");

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

@@ -21,6 +21,16 @@ public class TpTransactionReply {
 
     private Date createDate;
 
+    /**
+     * 住户端 的角色
+     */
+    private String taRoleName;
+
+    /**
+     * 被回复人 的角色
+     */
+    private String replyRoleName;
+
     public Integer getId() {
         return id;
     }
@@ -92,4 +102,20 @@ public class TpTransactionReply {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+
+    public String getTaRoleName() {
+        return taRoleName;
+    }
+
+    public void setTaRoleName(String taRoleName) {
+        this.taRoleName = taRoleName;
+    }
+
+    public String getReplyRoleName() {
+        return replyRoleName;
+    }
+
+    public void setReplyRoleName(String replyRoleName) {
+        this.replyRoleName = replyRoleName;
+    }
 }

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

@@ -27,6 +27,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+
 import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
 
 /**
@@ -96,11 +98,11 @@ public class AliPayServiceImpl implements AliPayServiceI {
 		AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
 		//SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
 		AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
-		model.setBody("我是测试数据");
-		model.setSubject("App支付测试Java");
+		model.setBody(tpBillInvoice.getBillName());
+		model.setSubject(tpBillInvoice.getBillName());
 		model.setOutTradeNo(tpBillInvoice.getOutTradeNo());
 		model.setTimeoutExpress("30m");
-		model.setTotalAmount("0.01");
+		model.setTotalAmount(BigDecimal.valueOf(Long.valueOf(tpBillInvoice.getPayPrice())).divide(new BigDecimal(100)).toString());
 		model.setProductCode("QUICK_MSECURITY_PAY");
 		request.setBizModel(model);
 		request.setNotifyUrl("http://106.14.20.193:8086/app-api/aliPayNotify");

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

@@ -134,8 +134,8 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		tpBillInvoice.setBillStatus("1");
 		tpBillInvoice.setPayDate(new Date());
 		tpBillInvoice.setUpdateDate(new Date());
-		// 缴费方式  0：微信支付  1：线下缴费
-		tpBillInvoice.setPayType("0");
+		// 缴费方式  0：微信支付  1：线下缴费 2.支付宝支付
+		tpBillInvoice.setPayType(resultMap.get("pay_type"));
 		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
 
 		//插入流水账单表
@@ -146,7 +146,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		tpBillStatement.setPayPrice(tpBillInvoice.getPayPrice());
 		tpBillStatement.setPayName(tpBillInvoice.getPayName());
 		tpBillStatement.setPayRemark(tpBillInvoice.getBillName());
-		tpBillStatement.setPayType("0");
+		tpBillStatement.setPayType(resultMap.get("pay_type"));
 		tpBillStatement.setCreateTime(new Date());
 		tpBillStatementMapper.insert(tpBillStatement);
 

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml

@@ -141,8 +141,10 @@
   </update>
   <select id="getCommunityIdAndTransactionId" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List"/>
-    from tp_transaction_reply
-    where community_id = #{communityId,jdbcType=INTEGER} and transaction_id = #{transactionId,jdbcType=INTEGER}
+      tr.*,
+      (select tsr.role_name from ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr on tsur.role_id = tsr.id where tsur.user_id = tr.ta_user_id) as taRoleName,
+      (select tsr.role_name from ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr on tsur.role_id = tsr.id where tsur.user_id = tr.reply_ta_user_id) as replyRoleName
+    from tp_transaction_reply tr
+    where tr.community_id = #{communityId,jdbcType=INTEGER} and tr.transaction_id = #{transactionId,jdbcType=INTEGER}
   </select>
 </mapper>