Przeglądaj źródła

[合同优化][修改][修改预览账单]

release_toaliyun_real
luozukai 7 lat temu
rodzic
commit
6549f08237
7 zmienionych plików z 42 dodań i 3 usunięć
  1. +28
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
  2. +2
    -2
      mallinkAdmin/src/main/resources/application-dev.yml
  3. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java
  6. +4
    -0
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
  7. +2
    -1
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 28
- 0
mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java Wyświetl plik

@@ -9,8 +9,10 @@ import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController; import com.iformall.controller.base.BaseController;
import com.iformall.controller.sys.UploadController; import com.iformall.controller.sys.UploadController;
import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCouponChannelMapper;
import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxMerchantMapper;
import com.iformall.service.WxAppinfoService; import com.iformall.service.WxAppinfoService;
import com.iformall.service.wechat.FmOpenService; import com.iformall.service.wechat.FmOpenService;
@@ -58,6 +60,9 @@ public class WxAppinfoController extends BaseController {
@Autowired @Autowired
private AsyncTaskExecutor asyncTaskExecutor; private AsyncTaskExecutor asyncTaskExecutor;


@Autowired
private WxCouponChannelMapper wxCouponChannelMapper;

@ApiOperation("加载老数据二维码") @ApiOperation("加载老数据二维码")
@GetMapping("/updateQrCode") @GetMapping("/updateQrCode")
public void updateQrCode(String p)throws ServletException, IOException { public void updateQrCode(String p)throws ServletException, IOException {
@@ -81,6 +86,29 @@ public class WxAppinfoController extends BaseController {
} }
} }


@ApiOperation("加载卷二维码")
@GetMapping("/updateCouponQrCode")
public void updateCouponQrCode(String p)throws ServletException, IOException {
if("xlldxx".equals(p)){
String pageUrl = "pages/index/index";

List<WxCouponChannel> list = wxCouponChannelMapper.findQrcodeEmptyList();
for (WxCouponChannel couponChannel:list) {
asyncTaskExecutor.execute(new Runnable() {
@Override
public void run() {
String param = couponChannel.getWeappScene();
ResultData resultData = exportQrcode(null,null,couponChannel.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true);
Map<String,String> map = (Map)resultData.data;
String url = map.get("url");
couponChannel.setQrCode(url);
wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel);
}
});
}
}
}

@ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}") @ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}")
@PostMapping("/downQrCode") @PostMapping("/downQrCode")
public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) throws MallinkException { public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) throws MallinkException {


+ 2
- 2
mallinkAdmin/src/main/resources/application-dev.yml Wyświetl plik

@@ -113,8 +113,8 @@ fm:
exception: false exception: false
exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com
deploy: 1 deploy: 1
open: true
upload_dir: /home/test/server/uploads/
open: false
upload_dir: ./upload/


ueditor: ueditor:
config: config.json config: config.json


+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql Wyświetl plik

@@ -0,0 +1,2 @@
ALTER TABLE wx_coupon_channel
ADD COLUMN qr_code VARCHAR(500) DEFAULT NULL COMMENT '二维码';

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java Wyświetl plik

@@ -71,6 +71,8 @@ public class WxCouponChannel extends BaseEntity {
private Date updateDate; private Date updateDate;
@io.swagger.annotations.ApiModelProperty(value="子频道ID",name="subTargetId") @io.swagger.annotations.ApiModelProperty(value="子频道ID",name="subTargetId")
private Long subTargetId; private Long subTargetId;
@io.swagger.annotations.ApiModelProperty(value="二维码",name="qrCode")
private String qrCode;


@Transient @Transient
@io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice")


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java Wyświetl plik

@@ -36,4 +36,6 @@ public interface WxCouponChannelMapper extends CommonMapper<WxCouponChannel, Str
void offExpiriedCouponChannel2ByEndTime(); void offExpiriedCouponChannel2ByEndTime();


void delByTopic(WxTopic wxTopic); void delByTopic(WxTopic wxTopic);

List<WxCouponChannel> findQrcodeEmptyList();
} }

+ 4
- 0
mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml Wyświetl plik

@@ -292,5 +292,9 @@
delete from wx_coupon_channel where sub_target_id = #{id} delete from wx_coupon_channel where sub_target_id = #{id}
</delete> </delete>


<select id="findQrcodeEmptyList" resultType="com.iformall.domain.po.WxCouponChannel">
select * from wx_coupon_channel where qr_code is null
</select>



</mapper> </mapper>

+ 2
- 1
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Wyświetl plik

@@ -37,6 +37,7 @@
<result column="auto_refund" jdbcType="INTEGER" property="autoRefund"/> <result column="auto_refund" jdbcType="INTEGER" property="autoRefund"/>
<result column="credit_price" jdbcType="INTEGER" property="creditPrice"/> <result column="credit_price" jdbcType="INTEGER" property="creditPrice"/>
<result column="credit_refund" jdbcType="INTEGER" property="creditRefund"/> <result column="credit_refund" jdbcType="INTEGER" property="creditRefund"/>
<result column="qr_code" property="qrCode"/>


</resultMap> </resultMap>
<resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo"> <resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo">
@@ -90,7 +91,7 @@
`id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`, `id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,
`remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`, `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,qr_code
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Ładowanie…
Anuluj
Zapisz